@@ -6,6 +6,7 @@ J_RUNNER = nqp-j$(BAT)
6
6
7
7
NQP_JAR_DIR = $(NQP_LANG_DIR)/runtime
8
8
JVM_BUILD_DIR = gen/jvm
9
+ TRUFFLE_BUILD_DIR = gen/truffle
9
10
10
11
TRUFFLE_JAVAS = \
11
12
src/vm/jvm/runtime/org/perl6/nqp/truffle/runtime/doubleconv/*.java \
@@ -50,6 +51,8 @@ J_STAGE0_DIR = src/vm/jvm/stage0
50
51
J_STAGE1_DIR = $(JVM_BUILD_DIR)/stage1
51
52
J_STAGE2_DIR = $(JVM_BUILD_DIR)/stage2
52
53
54
+ T_STAGE1_DIR = $(TRUFFLE_BUILD_DIR)/stage1
55
+
53
56
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
54
57
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
55
58
@@ -366,3 +369,21 @@ j-qregex-test: $(J_RUNNER)
366
369
367
370
j-qregex-test-loud: $(J_RUNNER)
368
371
$(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