"npm install" the runtime when it changes.

pmurias · Aug 14, 2014 · 4b45434 · 4b45434
1 parent 34c8c0a
commit 4b45434
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tools/build/Makefile-JS.in b/tools/build/Makefile-JS.in
@@ -99,13 +99,12 @@ nqp-js.js: $(JS_STAGE2)/NQPCORE.setting.pbc $(JS_STAGE2)/QASTNode.pbc $(JS_STAGE
 	./nqp-js-compile gen/js/stage2/NQP.nqp > nqp-js.js
 
 js-stage1-compiler : $(JS_STAGE1_COMPILER)
-JS_ALL =  $(JS_STAGE2)/NQPCORE.setting.pbc $(JS_STAGE2)/QASTNode.pbc $(JS_STAGE2)/QRegex.pbc $(JS_STAGE2)/NQPP6QRegex.pbc $(JS_STAGE2)/$(NQP_COMBINED)
-js-all : p-all js-stage1-compiler
+js-all : p-all js-stage1-compiler node_modules/installed
 js-runner-default : js-all
 js-test: js-all
 	src/vm/js/bin/run_tests
-node_modules/installed: $(JS_ALL)
-	npm install src/vm/js/nqp-runtime-core src/vm/js/nqp-runtime-node src/vm/js/nqp-runtime gen/js/stage2/NQPCORE.setting gen/js/stage2/QRegex gen/js/stage2/nqpmo gen/js/stage2/QASTNode gen/js/stage2/QAST gen/js/stage2/NQPP6QRegex gen/js/stage2/NQPHLL
+node_modules/installed: src/vm/js/nqp-runtime/runtime.js
+	npm install src/vm/js/nqp-runtime
 	touch node_modules/installed
 
 

diff --git a/tools/build/gen-js-makefile.nqp b/tools/build/gen-js-makefile.nqp
@@ -127,9 +127,9 @@ say("nqp-js.js: $nqpcore-pbc $QASTNode-pbc $QRegex-pbc $NQPP6QRegex-pbc $NQP-com
 ");
 
 deps('js-stage1-compiler', '$(JS_STAGE1_COMPILER)');
-constant('JS_ALL'," $nqpcore-pbc $QASTNode-pbc $QRegex-pbc $NQPP6QRegex-pbc $NQP-combined");
+#constant('JS_ALL'," $nqpcore-pbc $QASTNode-pbc $QRegex-pbc $NQPP6QRegex-pbc $NQP-combined");
 
-deps("js-all", 'p-all', 'js-stage1-compiler');
+deps("js-all", 'p-all', 'js-stage1-compiler', 'node_modules/installed');
 #deps("js-all", 'p-all', 'js-stage1-compiler', '$(JS_ALL)', 'node_modules/installed');
 
 # we don't have a proper runner yet but the Makefile structure requires that
@@ -138,8 +138,10 @@ deps('js-runner-default', 'js-all');
 say('js-test: js-all
 	src/vm/js/bin/run_tests');
 
-say('node_modules/installed: $(JS_ALL)
-	npm install src/vm/js/nqp-runtime-core src/vm/js/nqp-runtime-node src/vm/js/nqp-runtime gen/js/stage2/NQPCORE.setting gen/js/stage2/QRegex gen/js/stage2/nqpmo gen/js/stage2/QASTNode gen/js/stage2/QAST gen/js/stage2/NQPP6QRegex gen/js/stage2/NQPHLL
+#	npm install src/vm/js/nqp-runtime-core src/vm/js/nqp-runtime-node src/vm/js/nqp-runtime gen/js/stage2/NQPCORE.setting gen/js/stage2/QRegex gen/js/stage2/nqpmo gen/js/stage2/QASTNode gen/js/stage2/QAST gen/js/stage2/NQPP6QRegex gen/js/stage2/NQPHLL
+
+say('node_modules/installed: src/vm/js/nqp-runtime/runtime.js
+	npm install src/vm/js/nqp-runtime
 	touch node_modules/installed');
 
 say("\n\njs-clean: