Stop calling nqpmo "mininqpmo".

pmurias · Dec 1, 2014 · 7368510 · 7368510
1 parent d2fb4b8
commit 7368510
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/vm/js/mini-setting b/src/vm/js/mini-setting
@@ -1,4 +1,4 @@
-use mininqpmo;
+use nqpmo;
 
 # We'll re-export all of the HOWs that we import from the meta-objects
 # library. (Questionable whether we should need to do this - maybe the

diff --git a/tools/build/Makefile-JS.in b/tools/build/Makefile-JS.in
@@ -22,12 +22,12 @@ $(JS_STAGE2)/$(NQP_MO_COMBINED): $(NQP_MO_SOURCES)
 
 	$(PERL) tools/build/gen-cat.pl js $(NQP_MO_SOURCES)  > $(JS_STAGE2)/$(NQP_MO_COMBINED)
 
-$(JS_STAGE2)/mininqpmo.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(NQP_MO_COMBINED)
+$(JS_STAGE2)/nqpmo.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(NQP_MO_COMBINED)
 	$(MKPATH) $(JS_STAGE2)
-	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $(JS_STAGE2)/mininqpmo.moarvm $(JS_STAGE2)/$(NQP_MO_COMBINED) > node_modules/mininqpmo.js
+	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $(JS_STAGE2)/nqpmo.moarvm $(JS_STAGE2)/$(NQP_MO_COMBINED) > node_modules/nqpmo.js
 
 js-stage1-compiler : $(JS_STAGE1_COMPILER)
-node_modules/mini-setting.setting.js: js-stage1-compiler src/vm/js/mini-setting $(JS_STAGE2)/mininqpmo.moarvm
+node_modules/mini-setting.setting.js: js-stage1-compiler src/vm/js/mini-setting $(JS_STAGE2)/nqpmo.moarvm
 	$(MKPATH) gen/js/stage2
 	./nqp-m --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --module-path gen/js/stage2 --setting=NULL --target=mbc --output gen/js/stage2/mini-setting.setting.moarvm src/vm/js/mini-setting > node_modules/mini-setting.setting.js
 js-test: js-all

diff --git a/tools/build/gen-js-makefile.nqp b/tools/build/gen-js-makefile.nqp
@@ -97,7 +97,7 @@ constant('JS_STAGE1_COMPILER',"$stage1-qast-compiler-moar $stage1-hll-backend-mo
 
 my $nqp-mo-combined := combine(:stage(2), :sources('$(NQP_MO_SOURCES)'), :file('$(NQP_MO_COMBINED)'));
 
-my $nqp-mo-moarvm := cross-compile(:stage(2), :source($nqp-mo-combined), :target('mininqpmo'), :setting('NULL'), :no-regex-lib(1));
+my $nqp-mo-moarvm := cross-compile(:stage(2), :source($nqp-mo-combined), :target('nqpmo'), :setting('NULL'), :no-regex-lib(1));
 
 #
 #my $nqpcore-combined := combine(:stage(2), :sources('$(CORE_SETTING_SOURCES)'), :file('$(CORE_SETTING_COMBINED).nqp'));