Make part of Perl6::Ops backend-independent

Generate the module from backend-dependent source and from src/Perl6/Ops.nqp. Note: JS backend build is patched but cannot be tested on my macOS due to nodejs failing to install dependencies.
rakudo · Aug 21, 2019 · 567d45b · 567d45b
1 parent cd8463a
commit 567d45b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/Perl6/Ops.nqp b/src/Perl6/Ops.nqp
diff --git a/tools/build/gen-js-makefile.nqp b/tools/build/gen-js-makefile.nqp
@@ -91,7 +91,10 @@ my $ModuleLoader-nqp := combine(:sources("src/vm/js/ModuleLoaderVMConfig.nqp src
 
 
 my $Perl6-ModuleLoader := nqp($ModuleLoader-nqp, "$blib/Perl6-ModuleLoader.js");
-my $Perl6-Ops := nqp('src/vm/js/Perl6/Ops.nqp', "$blib/Perl6-Ops.js");
+
+my $Ops-nqp := combine(:sources('src/vm/js/Perl6/Ops.nqp src/Perl6/Ops.nqp'), :file<Perl6-Ops.nqp>);
+my $Perl6-Ops := nqp($Ops-nqp, "$blib/Perl6-Ops.js");
+
 my $Perl6-Pod := nqp('src/Perl6/Pod.nqp', "$blib/Perl6-Pod.js");
 my $Perl6-World := nqp('src/Perl6/World.nqp', "$blib/Perl6-World.js", :deps([$Perl6-Ops, $Perl6-Pod, $Perl6-ModuleLoader]));
 

diff --git a/tools/templates/jvm/Makefile.in b/tools/templates/jvm/Makefile.in
@@ -100,9 +100,9 @@ $(PERL6_ML_JAR): @nfpl(src/Perl6/ModuleLoader.nqp src/vm/jvm/ModuleLoaderVMConfi
 	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_ML_JAR) \
 	    @nfpq($(J_BUILD_DIR)/ModuleLoader.nqp)@
 
-$(PERL6_OPS_JAR): @nfpl(src/vm/jvm/Perl6/Ops.nqp gen/nqp-version)@
-	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_OPS_JAR) \
-	    @nfp(src/vm/jvm/Perl6/Ops.nqp)@
+$(PERL6_OPS_JAR): @nfpl(src/vm/jvm/Perl6/Ops.nqp src/Perl6/Ops.nqp gen/nqp-version)@
+	$(J_NQP) $(J_GEN_CAT) @nfpl(src/vm/jvm/Perl6/Ops.nqp src/Perl6/Ops.nqp )@ > @nfpq($(J_BUILD_DIR)/Perl6-Ops.nqp)@
+	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_OPS_JAR) @nfpq($(J_BUILD_DIR)/Perl6-Ops.nqp)@
 
 $(PERL6_W_JAR): $(PERL6_ML_JAR) $(PERL6_OPS_JAR) $(PERL6_P_JAR) @nfp(src/Perl6/World.nqp)@
 	$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_W_JAR) \

diff --git a/tools/templates/moar/Makefile.in b/tools/templates/moar/Makefile.in
@@ -152,9 +152,9 @@ $(PERL6_ML_MOAR): @nfp(src/Perl6/ModuleLoader.nqp)@ @nfp(src/vm/moar/ModuleLoade
 	$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_ML_MOAR) \
 		@nfpq($(M_BUILD_DIR)/ModuleLoader.nqp)@
 
-$(PERL6_OPS_MOAR): @nfp(src/vm/moar/Perl6/Ops.nqp)@ $(M_PERL6_OPS_DLL) @nfp(gen/nqp-version)@
-	$(M_NQP) --target=mbc --output=$(PERL6_OPS_MOAR) \
-		@nfp(src/vm/moar/Perl6/Ops.nqp)@
+$(PERL6_OPS_MOAR): @nfp(src/vm/moar/Perl6/Ops.nqp src/Perl6/Ops.nqp)@ $(M_PERL6_OPS_DLL) @nfp(gen/nqp-version)@
+	$(M_NQP) $(M_GEN_CAT) @nfpl(src/vm/moar/Perl6/Ops.nqp src/Perl6/Ops.nqp)@ > @nfpq($(M_BUILD_DIR)/Perl6-Ops.nqp)@
+	$(M_NQP) --target=mbc --output=$(PERL6_OPS_MOAR) @nfpq($(M_BUILD_DIR)/Perl6-Ops.nqp)@
 
 $(PERL6_W_MOAR): $(PERL6_ML_MOAR) $(PERL6_OPS_MOAR) $(PERL6_P_MOAR) @nfp(src/Perl6/World.nqp)@
 	$(M_NQP) --module-path=blib --target=mbc --output=$(PERL6_W_MOAR) \