Merge pull request #1584 from ajaxorg/make-language-worker

Add incremental "make update" target and remove generated worker files

.gitignore

@@ -30,6 +30,7 @@ plugins/cloud9.client.v8debug/node_modules/
 plugins/cloud9.static/node_modules/
 plugins-server/cloud9.fs/node_modules/
 plugins-client/lib.packed/www/
+plugins-client/lib.ace/www/worker/
 plugins-client/cloud9.core/www/js/
 node_modules/
 deps/ace/

Makefile

@@ -2,6 +2,8 @@
 
 default: apf worker
 
+update: worker
+
 # packages apf
 apf:
 	cd node_modules/packager; node package.js projects/apf_cloud9.apr
@@ -35,7 +37,21 @@ ext:
 	echo "module = {exports: undefined};" | cat - plugins-client/lib.packed/www/packed.js > temp_file && mv temp_file plugins-client/lib.packed/www/packed.js
 
 # calls dryice on worker & packages it
-worker:
+worker: plugins-client/lib.ace/www/worker/worker.js
+
+plugins-client/lib.ace/www/worker/worker.js : $(wildcard plugins-client/ext.language/*) \
+        $(wildcard plugins-client/ext.language/*/*) \
+        $(wildcard plugins-client/ext.codecomplete/*) \
+        $(wildcard plugins-client/ext.codecomplete/*/*) \
+        $(wildcard plugins-client/ext.jslanguage/*) \
+        $(wildcard plugins-client/ext.jslanguage/*/*) \
+        $(wildcard plugins-client/ext.jsinfer/*) \
+        $(wildcard plugins-client/ext.jsinfer/*/*) \
+        $(wildcard node_modules/treehugger/lib/*) \
+        $(wildcard node_modules/treehugger/lib/*/*) \
+        $(wildcard node_modules/ace/lib/*) \
+        $(wildcard node_modules/ace/*/*) \
+        Makefile.dryice.js
 	mkdir -p plugins-client/lib.ace/www/worker
 	rm -rf /tmp/c9_worker_build
 	mkdir -p /tmp/c9_worker_build/ext

bin/cloud9.sh

@@ -2,6 +2,8 @@
 
 cd `dirname $0`/..
 
+make update
+
 case `uname -a` in
 Linux*x86_64*)  echo "Linux 64 bit"   
     node server.js "$@" -a x-www-browser
@@ -34,4 +36,4 @@ SunOS*)  echo  "Solaris"
 
 *) echo "Unknown OS"
    ;;
-esac
+esac