Skip to content

Commit

Permalink
Intermidiate commit, first steps to merge Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
vrurg committed Aug 29, 2019
1 parent 0455f42 commit 74726ec
Show file tree
Hide file tree
Showing 5 changed files with 238 additions and 273 deletions.
104 changes: 104 additions & 0 deletions tools/templates/Makefile-backend-common.in
@@ -0,0 +1,104 @@


# GEN_CAT is only used in command lines, can be pre-quoted
@bpv(GEN_CAT)@ = @shquot(@script(gen-cat.nqp)@)@ @backend@

@bpv(BUILD_DIR)@ = @nfp(gen/@backend@)@
@bpv(BLIB_DIR)@ = @nfp(blib/Perl6)@
@bpv(NQP_LIBDIR)@ = @nqp::libdir@
@bpv(SET_NQP_LIB)@ = @set_nqp_lib@

# files we create
@bsv(PERL6)@ = perl6.@bext@
@bsv(PERL6_ML)@ = @nfp(@bpm(BLIB_DIR)@/ModuleLoader.@bext@)@
@bsv(PERL6_W)@ = @nfp(@bpm(BLIB_DIR)@/World.@bext@)@
@bsv(PERL6_G)@ = @nfp(@bpm(BLIB_DIR)@/Grammar.@bext@)@
@bsv(PERL6_OPS)@ = @nfp(@bpm(BLIB_DIR)@/Ops.@bext@)@
@bsv(PERL6_A)@ = @nfp(@bpm(BLIB_DIR)@/Actions.@bext@)@
@bsv(PERL6_O)@ = @nfp(@bpm(BLIB_DIR)@/Optimizer.@bext@)@
@bsv(PERL6_P)@ = @nfp(@bpm(BLIB_DIR)@/Pod.@bext@)@
@bsv(PERL6_C)@ = @nfp(@bpm(BLIB_DIR)@/Compiler.@bext@)@
@bsv(PERL6_M)@ = @nfp(@bpm(BLIB_DIR)@/Metamodel.@bext@)@
@for_specs(@bsv(PERL6_BOOTSTRAP)@ = @nfp(blib/Perl6/BOOTSTRAP/v6@lcspec@.@bext@)@
@bsv(SETTING_@ucspec@)@ = CORE.@lcspec@.setting.@bext@
)@

@bsv(PERL6_ML_SRC)@ = @nfp(src/vm/@backend@/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp)@ @bpm(ML_EXTRA)@
@bsv(PERL6_OPS_SRC)@ = @nfp(src/vm/@backend@/Perl6/Ops.nqp src/Perl6/Ops.nqp)@

@bsv(METAMODEL_ALL_SOURCES)@ = $(COMMON_METAMODEL_SOURCES) \
@bsm(METAMODEL_SOURCES)@

@for_specs(
@bpv(BOOTSTRAP_@ucspec@_SOURCES)@ = \
@insert_filelist(bootstrap_sources)@
)@

# The ordering in core_sources is important for bootstrapping reasons.
# In general:
# * traits almost certainly have to come first
# * stubs have to come after traits since they use them
# * Attribute needs to come before anything that uses an attribute
# We break various other circularities in Perl6::Metamodel::BOOTSTRAP.
# Note that you only really have to worry especially about things that
# the compiler will instantiate/call methods on while compiling the
# setting - basically anything that feels MOP-ish.
@for_specs(
@bpv(CORE_@ucspec@_SOURCES)@ = \
@insert_filelist(core_sources)@
)@
@bpv(CORE_ALL_SOURCES)@ =@for_specs( @bpm(CORE_@ucspec@_SOURCES)@)@

@for_specs(@bsv(PERL6_BOOTSTRAP)@ = @nfp(blib/Perl6/BOOTSTRAP/v6@lcspec@.@bext@)@
@bsv(SETTING)@ = CORE.@lcspec@.setting.@bext@
)@

@bpv(PERL6_PRECOMPS)@ = \
@bsm(PERL6_ML)@ @bsm(PERL6_W)@ @bsm(PERL6_G)@ @bsm(PERL6_OPS)@ \
@bsm(PERL6_A)@ @bsm(PERL6_O)@ @bsm(PERL6_P)@ @bsm(PERL6_C)@ \
@bsm(PERL6_M)@

@bpv(PERL6_BOOTSTRAP_PRECOMPS)@ =@for_specs( @bsm(PERL6_BOOTSTRAP)@)@

@bpv(DEBUG_RUNNER)@ = perl6-debug-@backend_abbr@@bpm(RUNNER_SUFFIX)@
@bpv(RUNNER)@ = perl6-@backend_abbr@@bpm(RUNNER_SUFFIX)@

@bsv(PERL6_DEBUG)@ = perl6-debug.@bext@

@bpv(CLEANUPS_ALL)@ = \
*.manifest \
@nfp(blib/Perl6/*.@bext@)@ \
@nfp(blib/Perl6/BOOTSTRAP/*.@bext@)@ \\@for_specs(
@bsm(SETTING_@ucspec@)@ \)@
@bsm(PERL6)@ \
@backend_prefix@-rakudo_test_run.tar.gz \
@nfp(@bpm(BUILD_DIR)@/*)@ \
@bsm(PERL6_DEBUG)@ \
@bpm(DEBUG_RUNNER)@ \
@bpm(RUNNER)@ \_DLL
@bpm(CLEANUPS)@

@bpv(HARNESS5)@ = $(PERL5) @nfp(t/harness5)@ --@backend@
@bpv(HARNESS5_WITH_FUDGE)@ = @bpm(HARNESS5)@ --fudge --keep-exit-code

# --- Pattern rules ---
@nfp(@bpm(BUILD_DIR)@/%.nqp)@:
@bpm(NQP)@ @bpm(GEN_CAT)@ $? > $@

@nfp(@bpm(BLIB_DIR)@/%.@bext@)@ : @nfp(@bpm(BUILD_DIR)@/%.nqp)@
@echo BUILDING $@
@bpm(NQP)@ --module-path=blib --target=@btarget@ --output=$@ $<

@backend_prefix@-all: check_@backend_prefix@_nqp_version @bsm(PERL6)@@for_specs( @bsm(SETTING_@ucspec@)@)@ @bpm(RUNNER)@ @bpm(DEBUG_RUNNER)@ @bsm(PERL6_DEBUG)@ @bpm(ALL_TARGETS)@)

check_@backend_abbr@_nqp_version: @@script(check-nqp-version.pl)@@
$(PERL5) @shquot(@script(check-nqp-version.pl)@)@ @bpm(NQP)@

@nfp(@bpm(BUILD_DIR)@/ModuleLoader.nqp)@: @bsm(PERL6_ML_SRC)@

@nfp(@bpm(BUILD_DIR)@/Ops.nqp)@: @bsm(PERL6_OPS_SRC)@

@bsm(PERL6_ML)@: @nfp(@bpm(BUILD_DIR)@/ModuleLoader.nqp)@ @nfp(gen/nqp-version)@

@bsm(PERL6_OPS)@: @nfp(@bpm(BUILD_DIR)@/Ops.nqp)@ @bpm(PERL6_OPS_EXTRA)@ @nfp(gen/nqp-version)@

6 changes: 4 additions & 2 deletions tools/templates/Makefile-common-macros.in
Expand Up @@ -21,8 +21,8 @@ BOOTSTRAP_SOURCES = \
@nfp(src/Perl6/Metamodel/BOOTSTRAP.nqp)@ \
@nfp(src/Perl6/Metamodel/EXPORTHOW.nqp)@ \

COMMON_BOOTSTRAP_SOURCES = \
@insert_filelist(common_bootstrap_sources)@
COMMON_METAMODEL_SOURCES = \
@insert_filelist(common_metamodel_sources)@

NQP_CONFIG_DIR = @nfp(3rdparty/nqp-configure/lib)@

Expand All @@ -35,3 +35,5 @@ CONFIGURE_SOURCES = \
R_SETTING_SRC = @nfp(src/RESTRICTED.setting)@

SPECTEST_DATA = @nfp(t/spec/spectest.data)@

HARNESS_TYPE = 5
File renamed without changes.
162 changes: 45 additions & 117 deletions tools/templates/jvm/Makefile.in
@@ -1,167 +1,95 @@
JAVA = java
JAVAC = javac
JAR = jar
J_NQP = @shquot(@j_nqp@)@
# J_GEN_CAT is only used in command lines, can be pre-quoted
J_GEN_CAT = @shquot(@script(gen-cat.nqp)@)@ jvm

NQP_PREFIX = @nqp_prefix@
NQP_PREFIX = @nqp_prefix@
@bpv(NQP)@ = @shquot(@j_nqp@)@
@bpv(NQP_RR)@ = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ nqp
@bpv(RUN_PERL6)@ = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ perl6

J_BUILD_DIR = @nfp(gen/jvm)@

J_LIBPATH = @nqp::libdir@
@bpv(RUNNER_SUFFX)@ = @runner_suffix@

NQP_JARS = @nqp_jars@
BLD_NQP_JARS = @bld_nqp_jars@

J_RUN_NQP_RR = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ nqp
J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ perl6

RUNTIME_JAVAS = @nfp(src/vm/jvm/runtime/org/perl6/rakudo/*.java)@

RUNTIME_JAR = rakudo-runtime.jar

J_BAT = @runner_suffix@
J_RUNNER = @j_runner@

# files we create
PERL6_JAR = perl6.jar
PERL6_ML_JAR = @nfp(blib/Perl6/ModuleLoader.jar)@
PERL6_W_JAR = @nfp(blib/Perl6/World.jar)@
PERL6_G_JAR = @nfp(blib/Perl6/Grammar.jar)@
PERL6_OPS_JAR = @nfp(blib/Perl6/Ops.jar)@
PERL6_A_JAR = @nfp(blib/Perl6/Actions.jar)@
PERL6_O_JAR = @nfp(blib/Perl6/Optimizer.jar)@
PERL6_P_JAR = @nfp(blib/Perl6/Pod.jar)@
PERL6_C_JAR = @nfp(blib/Perl6/Compiler.jar)@
PERL6_M_JAR = @nfp(blib/Perl6/Metamodel.jar)@
@for_specs(PERL6_BOOTSTRAP_@ucspec@_JAR = @nfp(blib/Perl6/BOOTSTRAP/v6@lcspec@.jar)@
SETTING_@ucspec@_JAR = CORE.@lcspec@.setting.jar
)@
SETTING_JAR = CORE.setting.jar

PERL6_LANG_JARS = $(PERL6_ML_JAR) $(PERL6_W_JAR) $(PERL6_G_JAR) $(PERL6_OPS_JAR) $(PERL6_A_JAR) \
$(PERL6_O_JAR) $(PERL6_P_JAR) $(PERL6_C_JAR) $(PERL6_M_JAR)

PERL6_BOOTSTRAP_JARS =@for_specs( $(PERL6_BOOTSTRAP_@ucspec@_JAR))@

J_METAMODEL_SOURCES = $(COMMON_BOOTSTRAP_SOURCES) \
@nfp(src/vm/jvm/Perl6/Metamodel/JavaHOW.nqp)@ \
@include(Makefile-backend-common)@

@for_specs(
J_BOOTSTRAP_@ucspec@_SOURCES = \
@insert_filelist(bootstrap_sources)@
)@

# The ordering here is important for bootstrapping reasons. In general:
# * traits almost certainly have to come first
# * stubs have to come after traits since they use them
# * Attribute needs to come before anything that uses an attribute
# We break various other circularities in Perl6::Metamodel::BOOTSTRAP.
# Note that you only really have to worry especially about things that
# the compiler will instantiate/call methods on while compiling the
# setting - basically anything that feels MOP-ish.
@for_specs(
J_CORE_@ucspec@_SOURCES = \
@insert_filelist(core_sources)@
)@
@bpv(BAT)@ = @runner_suffix@

J_CORE_ALL_SOURCES =@for_specs( $(J_CORE_@ucspec@_SOURCES))@
# This is addition to J_ALL_METAMODEL_SOURCES
@bsv(METAMODEL_SOURCES)@ = @nfp(src/vm/jvm/Perl6/Metamodel/JavaHOW.nqp)@

PERL6_DEBUG_JAR = perl6-debug.jar
J_DEBUG_RUNNER = perl6-debug-j@runner_suffix@
@bpv(ALL_TARGETS)@ = eval-client.pl

J_CLEANUPS = \
*.manifest \
@nfp(blib/Perl6/*.jar)@ \
@nfp(blib/Perl6/BOOTSTRAP/*.jar)@ \\@for_specs(
$(SETTING_@ucspec@_JAR) \)@
$(PERL6_JAR) \
j-rakudo_test_run.tar.gz \
@nfp($(J_BUILD_DIR)/*)@ \
@bpv(CLEANUPS)@ = \
$(RUNTIME_JAR) \
perl6-eval-server \
perl6-jdb-server \
eval-client.pl \
$(J_RUNNER) \
$(PERL6_DEBUG_JAR) \
$(J_DEBUG_RUNNER) \

HARNESS_TYPE =
eval-client.pl

J_HARNESS5 = $(PERL5) @nfp(t/harness5)@ --jvm
J_HARNESS5_WITH_FUDGE = $(J_HARNESS5) --fudge --keep-exit-code
@bpv(ML_EXTRA)@ = @nfp(src/vm/jvm/Perl6/JavaModuleLoader.nqp)@

j-all: check_@backend_prefix@_nqp_version $(PERL6_JAR)@for_specs( $(SETTING_@ucspec@_JAR))@ $(J_RUNNER) eval-client.pl $(PERL6_DEBUG_JAR) $(J_DEBUG_RUNNER)

check_@backend_prefix@_nqp_version: @@script(check-nqp-version.pl)@@
$(PERL5) @shquot(@script(check-nqp-version.pl)@)@ $(J_NQP)
@bpv(HARNESS_TYPE)@ = 5

$(RUNTIME_JAR): $(RUNTIME_JAVAS)
$(MKPATH) bin
$(JAVAC) --release 9 -cp @q($(BLD_NQP_JARS))@ -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
$(JAR) cf0 rakudo-runtime.jar -C bin@slash@ .

$(PERL6_ML_JAR): @nfpl(src/Perl6/ModuleLoader.nqp src/vm/jvm/ModuleLoaderVMConfig.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp gen/nqp-version)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/vm/jvm/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp src/vm/jvm/Perl6/JavaModuleLoader.nqp)@ > @nfpq($(J_BUILD_DIR)/ModuleLoader.nqp)@
$(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 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) \
@bsm(PERL6_W)@: @bsm(PERL6_ML)@ @bsm(PERL6_OPS)@ @bsm(PERL6_P)@ @nfp(src/Perl6/World.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_W)@ \
@nfp(src/Perl6/World.nqp)@

$(PERL6_P_JAR): @nfpl(src/Perl6/Pod.nqp gen/nqp-version)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_P_JAR) \
@bsm(PERL6_P)@: @nfpl(src/Perl6/Pod.nqp gen/nqp-version)@
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_P)@ \
@nfp(src/Perl6/Pod.nqp)@

$(PERL6_A_JAR): @nfp(src/Perl6/Actions.nqp)@ $(PERL6_P_JAR) $(PERL6_OPS_JAR)
@bsm(PERL6_A)@: @nfp(src/Perl6/Actions.nqp)@ @bsm(PERL6_P)@ @bsm(PERL6_OPS)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/Perl6/Actions.nqp \
src/Perl6/PodActions.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Actions.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_A_JAR) \
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_A)@ \
@nfpq($(J_BUILD_DIR)/Perl6-Actions.nqp)@

$(PERL6_G_JAR): @nfp(src/Perl6/Grammar.nqp)@ $(PERL6_W_JAR) $(PERL6_A_JAR) $(PERL6_P_JAR)
@bsm(PERL6_G)@: @nfp(src/Perl6/Grammar.nqp)@ @bsm(PERL6_W)@ @bsm(PERL6_A)@ @bsm(PERL6_P)@
$(J_NQP) $(J_GEN_CAT) @nfpl(src/Perl6/Grammar.nqp \
src/Perl6/PodGrammar.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Grammar.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_G_JAR) \
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_G)@ \
@nfpq($(J_BUILD_DIR)/Perl6-Grammar.nqp)@

$(PERL6_O_JAR): @nfp(src/Perl6/Optimizer.nqp)@ $(PERL6_OPS_JAR)
@bsm(PERL6_O)@: @nfp(src/Perl6/Optimizer.nqp)@ @bsm(PERL6_OPS)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/Perl6/Optimizer.nqp)@ > @nfpq($(J_BUILD_DIR)/Perl6-Optimizer.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_O_JAR) \
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_O)@ \
@nfpq($(J_BUILD_DIR)/Perl6-Optimizer.nqp)@

$(PERL6_C_JAR): @nfp(src/Perl6/Compiler.nqp)@ $(PERL6_O_JAR)
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_C_JAR) \
@bsm(PERL6_C)@: @nfp(src/Perl6/Compiler.nqp)@ @bsm(PERL6_O)@
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_C)@ \
@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) $(J_CORE_SOURCES)@for_specs( $(J_BOOTSTRAP_@ucspec@_SOURCES) $(J_CORE_@ucspec@_SOURCES))@
@bsm(PERL6)@: @nfp(src/main.nqp)@ $(RUNTIME_JAR) @bsm(PERL6_G)@ @bsm(PERL6_A)@ @bsm(PERL6_C)@ @bsm(PERL6_P)@ $(J_METAMODEL_SOURCES) $(J_CORE_SOURCES)@for_specs( $(J_BOOTSTRAP_@ucspec@_SOURCES) $(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) \
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6 --output=@bsm(PERL6)@ \
@nfpq($(J_BUILD_DIR)/main.nqp)@

$(PERL6_M_JAR): $(J_METAMODEL_SOURCES) $(PERL6_OPS_JAR)
@bsm(PERL6_M)@: $(J_METAMODEL_SOURCES) @bsm(PERL6_OPS)@
$(J_NQP) $(J_GEN_CAT) $(J_METAMODEL_SOURCES) > @nfpq($(J_BUILD_DIR)/Metamodel.nqp)@
$(J_NQP) --module-path=blib --target=jar --output=$(PERL6_M_JAR) \
$(J_NQP) --module-path=blib --target=jar --output=@bsm(PERL6_M)@ \
@nfpq($(J_BUILD_DIR)/Metamodel.nqp)@

@for_specs($(PERL6_BOOTSTRAP_@ucspec@_JAR): $(J_BOOTSTRAP_@ucspec@_SOURCES) $(PERL6_M_JAR)
@for_specs(@bsm(PERL6_BOOTSTRAP_@ucspec@)@: $(J_BOOTSTRAP_@ucspec@_SOURCES) @bsm(PERL6_M)@
$(J_NQP) $(J_GEN_CAT) $(J_BOOTSTRAP_@ucspec@_SOURCES) > @nfpq($(J_BUILD_DIR)/Perl6-BOOTSTRAP.@lcspec@.nqp)@
$(J_RUN_NQP_RR) --module-path=blib --target=jar --output=$(PERL6_BOOTSTRAP_@ucspec@_JAR) @nfpq($(J_BUILD_DIR)/Perl6-BOOTSTRAP.@lcspec@.nqp)@
$(J_RUN_NQP_RR) --module-path=blib --target=jar --output=@bsm(PERL6_BOOTSTRAP_@ucspec@)@ @nfpq($(J_BUILD_DIR)/Perl6-BOOTSTRAP.@lcspec@.nqp)@

$(SETTING_@ucspec@_JAR): $(PERL6_JAR) $(PERL6_BOOTSTRAP_@ucspec@_JAR) $(J_CORE_ALL_SOURCES)
@bsm(SETTING_@ucspec@)@: @bsm(PERL6)@ @bsm(PERL6_BOOTSTRAP_@ucspec@)@ $(J_CORE_ALL_SOURCES)
$(CONFIGURE) --expand @shquot(@ctx_template(core_sources)@)@ \
--out @nfpq($(J_BUILD_DIR)/core_sources.@lcspec@)@ \
--set-var=backend=@backend@
$(J_NQP) $(J_GEN_CAT) -f @nfpq($(J_BUILD_DIR)/core_sources.@lcspec@)@ > @nfpq($(J_BUILD_DIR)/CORE.@lcspec@.setting)@
@echo "The following step can take a long time, please be patient."
@set_nqp_lib@$(J_RUN_PERL6) --setting=NULL.@lcspec@ --ll-exception --optimize=3 --target=jar --stagestats --output=$(SETTING_@ucspec@_JAR) --nqp-lib=blib @nfpq($(J_BUILD_DIR)/CORE.@lcspec@.setting)@
$(J_SET_NQP_LIB)$(J_RUN_PERL6) --setting=NULL.@lcspec@ --ll-exception --optimize=3 --target=jar --stagestats --output=@bsm(SETTING_@ucspec@)@ --nqp-lib=blib @nfpq($(J_BUILD_DIR)/CORE.@lcspec@.setting)@
)@
$(J_RUNNER): @@script(create-jvm-runner.pl)@@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev . . @q($(NQP_PREFIX))@ --nqp-lib=blib @q($(NQP_JARS))@
Expand All @@ -170,12 +98,12 @@ j-runner-default: j-all
$(CP) $(J_RUNNER) perl6$(J_BAT)
$(CHMOD) 755 perl6$(J_BAT)

$(PERL6_DEBUG_JAR): @nfp(src/perl6-debug.nqp)@ $(PERL6_JAR)
@bsm(PERL6_DEBUG)@: @nfp(src/perl6-debug.nqp)@ @bsm(PERL6)@
$(J_NQP) $(J_GEN_CAT) @nfp(src/perl6-debug.nqp)@ @nfpq($(J_BUILD_DIR)/main-version.nqp)@ > @nfpq($(J_BUILD_DIR)/perl6-debug.nqp)@
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6-debug --output=$(PERL6_DEBUG_JAR) \
$(J_NQP) --module-path=blib --target=jar --javaclass=perl6-debug --output=@bsm(PERL6_DEBUG)@ \
@nfpq($(J_BUILD_DIR)/perl6-debug.nqp)@

$(J_DEBUG_RUNNER): @@script(create-jvm-runner.pl)@@ $(PERL6_DEBUG_JAR)
$(J_DEBUG_RUNNER): @@script(create-jvm-runner.pl)@@ @bsm(PERL6_DEBUG)@
$(PERL5) @shquot(@script(create-jvm-runner.pl)@)@ dev-debug . . @q($(NQP_PREFIX))@ --nqp-lib=blib @q($(NQP_JARS))@

eval-client.pl:
Expand Down Expand Up @@ -226,14 +154,14 @@ sometests: j-all

j-install: j-all @@script(create-jvm-runner.pl)@@ @@script(install-core-dist.p6)@@
$(MKPATH) @nfpq($(DESTDIR)$(PREFIX)/bin)@
$(MKPATH) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(MKPATH) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6/BOOTSTRAP)@
$(MKPATH) @nfpq($(DESTDIR)$(J_NQP_LIBDIR)/Perl6)@
$(MKPATH) @nfpq($(DESTDIR)$(J_NQP_LIBDIR)/Perl6/BOOTSTRAP)@
$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_LANG_JARS) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6)@
$(CP) $(PERL6_BOOTSTRAP_JARS) @nfpq($(DESTDIR)$(J_LIBPATH)/Perl6/BOOTSTRAP)@
$(CP) @for_specs($(SETTING_@ucspec@_JAR) )@@nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(PERL6_DEBUG_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(J_PERl6_PRECOMPS) @nfpq($(DESTDIR)$(J_NQP_LIBDIR)/Perl6)@
$(CP) $(J_PERL6_BOOSTRAP_PRECOMPS) @nfpq($(DESTDIR)$(J_NQP_LIBDIR)/Perl6/BOOTSTRAP)@
$(CP) @for_specs(@bsm(SETTING_@ucspec@)@ )@@nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) @bsm(PERL6)@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) @bsm(PERL6_DEBUG)@ @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
$(CP) $(RUNTIME_JAR) @nfpq($(DESTDIR)$(PERL6_HOME)/runtime)@
@nfpq($(BASE_DIR)/$(J_RUNNER))@ @shquot(@script(upgrade-repository.p6)@)@ @shquot($(DESTDIR)$(PERL6_HOME))@
$(MKPATH) @nfpq($(DESTDIR)$(PERL6_HOME)/vendor)@
Expand All @@ -251,7 +179,7 @@ j-runner-default-install: j-install

## cleaning
j-clean:
$(RM_F) $(J_CLEANUPS)
$(RM_F) $(J_CLEANUPS_ALL)
$(RM_RF) bin

j-testclean:
Expand Down

0 comments on commit 74726ec

Please sign in to comment.