Build QRegex for use by the js backend, pass more tests.

pmurias · Mar 17, 2014 · fb5b4b7 · fb5b4b7
1 parent 6b6e179
commit fb5b4b7
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/tools/build/Makefile-JS.in b/tools/build/Makefile-JS.in
@@ -56,7 +56,8 @@ $(PERL6_QCJ_PBC):  $(PERL6_QCJ)
 js-clean:
 	$(RM_RF) $(PERL6_QCJ_PBC)
 
-cross_compiler=$(PERL6_QCJ_PBC) $(HLL_PBC) $(JS_STAGE2)/$(CORE_SETTING_COMBINED)x $(JS_STAGE2)/nqpmo.pbc $(JS_STAGE2)/$(NQPCORE_PBC) $(JS_STAGE2)/QASTNode.pbc
+cross_compiler=$(PERL6_QCJ_PBC) $(HLL_PBC) $(JS_STAGE2)/$(CORE_SETTING_COMBINED)x $(JS_STAGE2)/nqpmo.pbc $(JS_STAGE2)/$(NQPCORE_PBC) $(JS_STAGE2)/QRegex.pbc
+#$(JS_STAGE2)/NQPP6QRegex.pbc
 
 cross_compiler: $(cross_compiler)
 
@@ -86,9 +87,22 @@ $(JS_STAGE2)/$(NQPCORE_PBC) : $(JS_STAGE2)/$(CORE_SETTING_COMBINED)x $(JS_STAGE2
 
 $(JS_STAGE2)/QASTNode.pbc: $(QASTNODE_SOURCES) $(stage2_core) $(core_compiler)
 	$(PERL) tools/build/gen-cat.pl moar $(QASTNODE_SOURCES) > $(JS_STAGE2)/$(QASTNODE_COMBINED)
-	nqp-p --module-path $(JS_STAGE1) src/vm/js/bin/compile-setting.nqp $(JS_STAGE2)/$(QASTNODE_COMBINED) node_modules/QASTNode $(JS_STAGE2)/QASTNode.pir NQPCORE
+	nqp-p --module-path $(JS_STAGE1) src/vm/js/bin/compile-setting.nqp $(JS_STAGE2)/$(QASTNODE_COMBINED) $(JS_STAGE2)/QASTNode $(JS_STAGE2)/QASTNode.pir NQPCORE
 	$(PARROT)  -o  $(JS_STAGE2)/QASTNode.pbc $(JS_STAGE2)/QASTNode.pir
 
+$(JS_STAGE2)/QRegex.pbc: $(QREGEX_SOURCES) $(JS_STAGE2)/QASTNode.pbc
+	$(MKPATH) $(JS_STAGE2)/gen
+	$(PERL) tools/build/gen-cat.pl js $(QREGEX_SOURCES) > $(JS_STAGE2)/$(QREGEX_COMBINED)
+	nqp-p --module-path $(JS_STAGE1) src/vm/js/bin/compile-setting.nqp $(JS_STAGE2)/$(QREGEX_COMBINED) $(JS_STAGE2)/QRegex $(JS_STAGE2)/QRegex.pir NQPCORE
+	$(PARROT)  -o  $(JS_STAGE2)/QRegex.pbc $(JS_STAGE2)/QRegex.pir
+
+
+#$(JS_STAGE2)/NQPP6QRegex.pbc: $(P6QREGEX_SOURCES) $(JS_STAGE2)/QRegex.pbc
+#	$(MKPATH) $(JS_STAGE2)/gen
+#	$(PERL) tools/build/gen-cat.pl moar $(P6QREGEX_SOURCES) > $(JS_STAGE2)/$(P6QREGEX_COMBINED)
+#	nqp-p --module-path $(JS_STAGE1) src/vm/js/bin/compile-setting.nqp $(JS_STAGE2)/$(P6QREGEX_COMBINED) node_modules/NQPP6QRegex $(JS_STAGE2)/NQPP6QRegex.pbc NQPCORE
+#	$(PARROT)  -o  $(JS_STAGE2)/NQPP6QRegex.pbc $(JS_STAGE2)/NQPP6QRegex.pir
+
 js-test: js-all
 	prove -r --exec "./nqp-js" t/nqp/01-literals.t t/nqp/02-if.t