Skip to content

Commit c0231bc

Browse files
committed
[truffle] Add a t-setting to compile the setting to .truffle6 bytecode
1 parent 1451384 commit c0231bc

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

tools/build/Makefile-JVM.in

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ J_RUNNER = nqp-j$(BAT)
66

77
NQP_JAR_DIR = $(NQP_LANG_DIR)/runtime
88
JVM_BUILD_DIR = gen/jvm
9+
TRUFFLE_BUILD_DIR = gen/truffle
910

1011
TRUFFLE_JAVAS = \
1112
src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/doubleconv/*.java \
@@ -50,6 +51,8 @@ J_STAGE0_DIR = src/vm/jvm/stage0
5051
J_STAGE1_DIR = $(JVM_BUILD_DIR)/stage1
5152
J_STAGE2_DIR = $(JVM_BUILD_DIR)/stage2
5253

54+
T_STAGE1_DIR = $(TRUFFLE_BUILD_DIR)/stage1
55+
5356
J_STAGE0_NQP = $(JAVA) -cp $(J_STAGE0_DIR) -Xbootclasspath/a:$(J_STAGE0_DIR)@cpsep@nqp-runtime.jar@cpsep@$(THIRDPARTY_JARS)@cpsep@$(J_STAGE0_DIR)/nqp.jar nqp --bootstrap
5457
J_STAGE1_NQP = $(JAVA) -cp $(J_STAGE1_DIR) -Xbootclasspath/a:$(J_STAGE1_DIR)@cpsep@nqp-runtime.jar@cpsep@$(THIRDPARTY_JARS)@cpsep@$(J_STAGE1_DIR)/nqp.jar nqp --bootstrap
5558

@@ -366,3 +369,21 @@ j-qregex-test: $(J_RUNNER)
366369

367370
j-qregex-test-loud: $(J_RUNNER)
368371
$(PROVE) -r -v --exec .@slash@$(J_RUNNER) t/qregex
372+
373+
374+
$(T_STAGE1_DIR)/$(NQP_MO_JAR): $(NQP_MO_SOURCES) $(ALL_OUTPUT) $(J_RUNNER)
375+
$(MKPATH) $(T_STAGE1_DIR)
376+
$(PERL) tools/build/gen-cat.pl jvm $(NQP_MO_SOURCES) > $(T_STAGE1_DIR)/$(NQP_MO_COMBINED)
377+
378+
.@slash@$(J_RUNNER) src/vm/jvm/bin/cross-compile.nqp --setting=NULL --target=jar --truffle-output $(T_STAGE1_DIR)/nqpmo.truffle6 --output $(T_STAGE1_DIR)/$(NQP_MO_JAR) --no-regex-lib $(T_STAGE1_DIR)/$(NQP_MO_COMBINED)
379+
380+
t-setting: $(T_STAGE1_DIR)/$(NQP_MO_JAR) $(T_STAGE1_DIR)/$(MODULE_LOADER_JAR) $(T_STAGE1_DIR)/$(CORE_SETTING_JAR)
381+
382+
383+
$(T_STAGE1_DIR)/$(MODULE_LOADER_JAR): $(ALL_OUTPUT) $(J_RUNNER) src/vm/jvm/ModuleLoader.nqp
384+
.@slash@$(J_RUNNER) src/vm/jvm/bin/cross-compile.nqp --setting=NULL --target=jar --truffle-output $(T_STAGE1_DIR)/ModuleLoader.truffle6 --output $(T_STAGE1_DIR)/$(MODULE_LOADER_JAR) --no-regex-lib src/vm/jvm/ModuleLoader.nqp
385+
386+
$(T_STAGE1_DIR)/$(CORE_SETTING_JAR): $(ALL_OUTPUT) $(CORE_SETTING_SOURCES) $(T_STAGE1_DIR)/$(NQP_MO_JAR) $(T_STAGE1_DIR)/$(MODULE_LOADER_JAR)
387+
$(MKPATH) $(T_STAGE1_DIR)
388+
$(PERL) tools/build/gen-cat.pl truffle $(CORE_SETTING_SOURCES) > $(T_STAGE1_DIR)/$(CORE_SETTING_COMBINED)
389+
.@slash@$(J_RUNNER) src/vm/jvm/bin/cross-compile.nqp --module-path=$(T_STAGE1_DIR) --setting=NULL --target=jar --truffle-output $(T_STAGE1_DIR)/CORE.truffle6 --output $(T_STAGE1_DIR)/$(CORE_SETTING_JAR) --no-regex-lib $(T_STAGE1_DIR)/$(CORE_SETTING_COMBINED)

0 commit comments

Comments
 (0)