Skip to content
Permalink
Browse files

Get around too long command line.

Expand core_sources filelist into a build directory and then pass the
expanded version to gen-cat.

Cleanup everything in moar's build directory.
  • Loading branch information...
vrurg committed May 24, 2019
1 parent bba187b commit 88218704c92ec1b83a06d94fecb3d16945fd2090
Showing with 12 additions and 6 deletions.
  1. +6 −3 tools/templates/jvm/Makefile.in
  2. +6 −3 tools/templates/moar/Makefile.in
@@ -54,7 +54,7 @@ J_METAMODEL_SOURCES = $(COMMON_BOOTSTRAP_SOURCES) \
# the compiler will instantiate/call methods on while compiling the
# setting - basically anything that feels MOP-ish.
J_CORE_SOURCES = \
@insert_filelist(jvm_core_sources)@
@insert_filelist(core_sources)@
@for_specs(
J_CORE_@ucspec@_SOURCES = \
@insert_filelist(rev_core_sources)@
@@ -132,7 +132,7 @@ $(PERL6_C_JAR): @nfp(src/Perl6/Compiler.nqp)@ $(PERL6_O_JAR)
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_C_JAR) \
@nfp(src/Perl6/Compiler.nqp)@

$(PERL6_JAR): @nfp(src/main.nqp)@ $(RUNTIME_JAR) $(PERL6_G_JAR) $(PERL6_A_JAR) $(PERL6_C_JAR) $(PERL6_P_JAR) $(J_METAMODEL_SOURCES) $(BOOTSTRAP_SOURCES) $(J_CORE_SOURCES) $(J_CORE_D_SOURCES)
$(PERL6_JAR): @nfp(src/main.nqp)@ $(RUNTIME_JAR) $(PERL6_G_JAR) $(PERL6_A_JAR) $(PERL6_C_JAR) $(PERL6_P_JAR) $(J_METAMODEL_SOURCES) $(BOOTSTRAP_SOURCES) $(J_CORE_SOURCES)@for_specs( $(J_CORE_@ucspec@_SOURCES))@
$(CONFIGURE) --expand main-version --out @nfpq($(J_BUILD_DIR)/main-version.nqp)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/main.nqp)@ @nfpq($(J_BUILD_DIR)/main-version.nqp)@ > @nfpq($(J_BUILD_DIR)/main.nqp)@
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6 --output=$(PERL6_JAR) \
@@ -148,7 +148,10 @@ $(PERL6_B_JAR): $(BOOTSTRAP_SOURCES) $(PERL6_M_JAR)
$(J_RUN_NQP_RR) --module-path=blib --target=jar --output=$(PERL6_B_JAR) @nfpq($(J_BUILD_DIR)/BOOTSTRAP.nqp)@

$(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
$(J_NQP) $(J_GEN_CAT) $(J_CORE_SOURCES) > @nfpq($(J_BUILD_DIR)/CORE.setting)@
$(CONFIGURE) --expand @shquot(@template(core_sources)@)@ \
--out @nfpq($(J_BUILD_DIR)/core_sources)@ \
--set-var=backend=@backend@
$(J_NQP) $(J_GEN_CAT) -f @nfpq($(J_BUILD_DIR)/core_sources)@ > @nfpq($(J_BUILD_DIR)/CORE.setting)@
@echo "The following step can take a long time, please be patient."
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) --nqp-lib=blib @nfpq($(J_BUILD_DIR)/CORE.setting)@

@@ -80,7 +80,7 @@ M_BOOTSTRAP_SOURCES = $(BOOTSTRAP_SOURCES) @nfp(src/vm/moar/spesh-plugins.nqp)@
# the compiler will instantiate/call methods on while compiling the
# setting - basically anything that feels MOP-ish.
M_CORE_SOURCES = \
@insert_filelist(core_sources)@
@insert_filelist(core_sources)@
@for_specs(
M_CORE_@ucspec@_SOURCES = \
@insert_filelist(rev_core_sources)@
@@ -108,7 +108,7 @@ M_CLEANUPS = \
$(PERL6_DEBUG_MOAR) \
$(M_BAT_DEBUG_RUNNER) \
$(M_C_DEBUG_RUNNER) \
$(M_BUILD_DIR)@slash@*.* \
$(M_BUILD_DIR)@slash@* \
@m_cleanups@

HARNESS_TYPE = 5
@@ -187,7 +187,10 @@ $(PERL6_B_MOAR): $(M_BOOTSTRAP_SOURCES) $(PERL6_M_MOAR)
--vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init @nfpq($(M_BUILD_DIR)/BOOTSTRAP.nqp)@

$(SETTING_MOAR): $(PERL6_MOAR) $(PERL6_B_MOAR) $(M_CORE_SOURCES)
$(M_NQP) $(M_GEN_CAT) $(M_CORE_SOURCES) > @nfpq($(M_BUILD_DIR)/CORE.setting)@
$(CONFIGURE) --expand @shquot(@template(core_sources)@)@ \
--out @nfpq($(M_BUILD_DIR)/core_sources)@ \
--set-var=backend=@backend@
$(M_NQP) $(M_GEN_CAT) -f @nfpq($(M_BUILD_DIR)/core_sources)@ > @nfpq($(M_BUILD_DIR)/CORE.setting)@
@echo "The following step can take a long time, please be patient."
$(M_RUN_PERL6) --setting=NULL --ll-exception --optimize=3 --target=mbc --stagestats --output=$(SETTING_MOAR) @nfpq($(M_BUILD_DIR)/CORE.setting)@

0 comments on commit 8821870

Please sign in to comment.
You can’t perform that action at this time.