Skip to content

Commit 7aa9537

Browse files
committed
JVM build: reduce number of shellouts by combining several $(CP) steps into one
1 parent dbaecae commit 7aa9537

File tree

1 file changed

+10
-26
lines changed

1 file changed

+10
-26
lines changed

tools/build/Makefile-JVM.in

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,12 @@ j-install: j-all
8080
$(MKPATH) $(DESTDIR)$(BIN_DIR)
8181
$(MKPATH) $(DESTDIR)$(NQP_JAR_DIR)
8282
$(MKPATH) $(DESTDIR)$(NQP_LIB_DIR)
83-
$(CP) 3rdparty/asm/asm-4.1.jar $(DESTDIR)$(NQP_JAR_DIR)
84-
$(CP) 3rdparty/asm/asm-tree-4.1.jar $(DESTDIR)$(NQP_JAR_DIR)
85-
$(CP) 3rdparty/jline/jline-1.0.jar $(DESTDIR)$(NQP_JAR_DIR)
86-
$(CP) 3rdparty/jna/jna.jar $(DESTDIR)$(NQP_JAR_DIR)
87-
$(CP) $(RUNTIME_JAR) $(DESTDIR)$(NQP_JAR_DIR)
88-
$(CP) $(NQP_MO_JAR) $(DESTDIR)$(NQP_LIB_DIR)
89-
$(CP) $(MODULE_LOADER_JAR) $(DESTDIR)$(NQP_LIB_DIR)
90-
$(CP) $(CORE_SETTING_JAR) $(DESTDIR)$(NQP_LIB_DIR)
91-
$(CP) $(QASTNODE_JAR) $(DESTDIR)$(NQP_LIB_DIR)
92-
$(CP) $(QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
93-
$(CP) $(HLL_JAR) $(DESTDIR)$(NQP_LIB_DIR)
94-
$(CP) $(JASTNODES_JAR) $(DESTDIR)$(NQP_LIB_DIR)
95-
$(CP) $(QAST_JAR) $(DESTDIR)$(NQP_LIB_DIR)
96-
$(CP) $(P6QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
97-
$(CP) $(NQP_JAR) $(DESTDIR)$(NQP_LIB_DIR)
98-
$(CP) $(P5QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
83+
$(CP) 3rdparty/asm/asm-4.1.jar 3rdparty/asm/asm-tree-4.1.jar $(DESTDIR)$(NQP_JAR_DIR)
84+
$(CP) 3rdparty/jline/jline-1.0.jar 3rdparty/jna/jna.jar $(DESTDIR)$(NQP_JAR_DIR)
85+
$(CP) $(RUNTIME_JAR) $(NQP_MO_JAR) $(MODULE_LOADER_JAR) $(DESTDIR)$(NQP_JAR_DIR)
86+
$(CP) $(CORE_SETTING_JAR) $(QASTNODE_JAR) $(QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
87+
$(CP) $(HLL_JAR) $(JASTNODES_JAR) $(QAST_JAR) $(P6QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
88+
$(CP) $(NQP_JAR) $(P5QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR)
9989
$(CP) $(EVAL_CLIENT) $(DESTDIR)$(BIN_DIR)
10090
$(CHMOD) 0755 $(DESTDIR)$(BIN_DIR)/eval-client.pl
10191
$(PERL) tools/build/install-jvm-runner.pl "$(DESTDIR)" $(PREFIX)
@@ -251,16 +241,10 @@ $(J_STAGE2)/$(NQP_JAR): $(J_STAGE1) $(J_NQP_SOURCES) $(J_STAGE2)/$(P6QREGEX_JAR)
251241
--output=$(J_STAGE2)/$(NQP_JAR) $(J_STAGE2)/$(NQP_COMBINED)
252242

253243
$(ALL_OUTPUT): $(J_STAGE2_OUTPUT)
254-
$(CP) $(J_STAGE2)/$(NQP_MO_JAR) .
255-
$(CP) $(J_STAGE2)/$(MODULE_LOADER_JAR) .
256-
$(CP) $(J_STAGE2)/$(CORE_SETTING_JAR) .
257-
$(CP) $(J_STAGE2)/$(QASTNODE_JAR) .
258-
$(CP) $(J_STAGE2)/$(QREGEX_JAR) .
259-
$(CP) $(J_STAGE2)/$(HLL_JAR) .
260-
$(CP) $(J_STAGE2)/$(JASTNODES_JAR) .
261-
$(CP) $(J_STAGE2)/$(QAST_JAR) .
262-
$(CP) $(J_STAGE2)/$(P6QREGEX_JAR) .
263-
$(CP) $(J_STAGE2)/$(NQP_JAR) .
244+
$(CP) $(J_STAGE2)/$(NQP_MO_JAR) $(J_STAGE2)/$(MODULE_LOADER_JAR) .
245+
$(CP) $(J_STAGE2)/$(CORE_SETTING_JAR) $(J_STAGE2)/$(QASTNODE_JAR) .
246+
$(CP) $(J_STAGE2)/$(QREGEX_JAR) $(J_STAGE2)/$(HLL_JAR) $(J_STAGE2)/$(JASTNODES_JAR) .
247+
$(CP) $(J_STAGE2)/$(QAST_JAR) $(J_STAGE2)/$(P6QREGEX_JAR) $(J_STAGE2)/$(NQP_JAR) .
264248

265249
$(J_RUNNER): src/vm/jvm/runners/$(J_RUNNER)
266250
$(CP) src/vm/jvm/runners/$(J_RUNNER) .

0 commit comments

Comments
 (0)