Merge branch 'master' of github.com:dustinswan/dotfiles

bin/webclient_files_have_changed

@@ -4,8 +4,12 @@
 p4 edit visimeet.appcache
 sed -i "2 s/.*/#$(date +%s)/" visimeet.appcache
 
+# compile jsx into js
+jsx js/jsx js
+
 # remake concatenated js and css files
 xargs cat < js/all_desktop.inc > /opt/iocom/user/webclient/all_desktop.js
 xargs cat < css/all_desktop.inc > /opt/iocom/user/webclient/css/all_desktop.css
 
-#cat js/all_desktop.inc | xargs uglifyjs -o all_desktop.js
+xargs cat < js/webrtc_api.inc > /opt/iocom/user/webclient/visiwebrtc.js
+uglifyjs /opt/iocom/user/webclient/visiwebrtc.js -o /opt/iocom/user/webclient/visiwebrtc.js