Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
7096016: SA build still produces "arg list too long" errors
Thu, 29 Sep 2011 13:47:57 -0700
- author
- never
- date
- Thu, 29 Sep 2011 13:47:57 -0700
- changeset 3159
- 098acdf97f09
- parent 3158
- cb315dc80374
- child 3160
- dc45ae774613
7096016: SA build still produces "arg list too long" errors
Reviewed-by: kvn, never
Contributed-by: volker.simonis@gmail.com
1.1 --- a/make/linux/makefiles/sa.make Thu Sep 29 09:53:56 2011 -0700 1.2 +++ b/make/linux/makefiles/sa.make Thu Sep 29 13:47:57 2011 -0700 1.3 @@ -43,13 +43,7 @@ 1.4 # TODO: if it's a modules image, check if SA module is installed. 1.5 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules 1.6 1.7 -# gnumake 3.78.1 does not accept the *s that 1.8 -# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them 1.9 -AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) 1.10 -AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) 1.11 - 1.12 -AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list 1.13 -AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list 1.14 +AGENT_FILES_LIST := $(GENERATED)/agent.classes.list 1.15 1.16 SA_CLASSDIR = $(GENERATED)/saclasses 1.17 1.18 @@ -68,7 +62,7 @@ 1.19 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 1.20 fi 1.21 1.22 -$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 1.23 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES) 1.24 $(QUIETLY) echo "Making $@" 1.25 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 1.26 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 1.27 @@ -82,7 +76,6 @@ 1.28 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 1.29 mkdir -p $(SA_CLASSDIR); \ 1.30 fi 1.31 - 1.32 # Note: When indented, make tries to execute the '$(shell' comment. 1.33 # In some environments, cmd processors have limited line length. 1.34 # To prevent the javac invocation in the next block from using 1.35 @@ -93,13 +86,12 @@ 1.36 # the initialization of the lists is also done in the same phase 1.37 # using '$(shell rm ...' instead of using the more traditional 1.38 # 'rm ...' rule. 1.39 - $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)) 1.40 - $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) 1.41 - $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) 1.42 - 1.43 - $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) 1.44 - $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) 1.45 - 1.46 + $(shell rm -rf $(AGENT_FILES_LIST)) 1.47 +# gnumake 3.78.1 does not accept the *'s that 1.48 +# are in AGENT_FILES, so use the shell to expand them. 1.49 +# Be extra carefull to not produce too long command lines in the shell! 1.50 + $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) 1.51 + $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) 1.52 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 1.53 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) 1.54 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 1.55 @@ -118,4 +110,4 @@ 1.56 clean: 1.57 rm -rf $(SA_CLASSDIR) 1.58 rm -rf $(GENERATED)/sa-jdi.jar 1.59 - rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) 1.60 + rm -rf $(AGENT_FILES_LIST)
2.1 --- a/make/sa.files Thu Sep 29 09:53:56 2011 -0700 2.2 +++ b/make/sa.files Thu Sep 29 13:47:57 2011 -0700 2.3 @@ -36,7 +36,7 @@ 2.4 # Splitted the set of files into two sets because on linux plaform 2.5 # listing or compiling all the files results in 'Argument list too long' error. 2.6 2.7 -AGENT_FILES1 = \ 2.8 +AGENT_FILES = \ 2.9 $(AGENT_SRC_DIR)/sun/jvm/hotspot/*.java \ 2.10 $(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/*.java \ 2.11 $(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/amd64/*.java \ 2.12 @@ -91,10 +91,7 @@ 2.13 $(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \ 2.14 $(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java \ 2.15 $(AGENT_SRC_DIR)/sun/jvm/hotspot/opto/*.java \ 2.16 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/prims/*.java 2.17 - 2.18 - 2.19 -AGENT_FILES2 = \ 2.20 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/prims/*.java \ 2.21 $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/*.java \ 2.22 $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/amd64/*.java \ 2.23 $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd/*.java \
3.1 --- a/make/solaris/makefiles/sa.make Thu Sep 29 09:53:56 2011 -0700 3.2 +++ b/make/solaris/makefiles/sa.make Thu Sep 29 13:47:57 2011 -0700 3.3 @@ -39,13 +39,7 @@ 3.4 # TODO: if it's a modules image, check if SA module is installed. 3.5 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules 3.6 3.7 -# gnumake 3.78.1 does not accept the *s that 3.8 -# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them 3.9 -AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) 3.10 -AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) 3.11 - 3.12 -AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list 3.13 -AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list 3.14 +AGENT_FILES_LIST := $(GENERATED)/agent.classes.list 3.15 3.16 SA_CLASSDIR = $(GENERATED)/saclasses 3.17 3.18 @@ -59,7 +53,7 @@ 3.19 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 3.20 fi 3.21 3.22 -$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 3.23 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES) 3.24 $(QUIETLY) echo "Making $@"; 3.25 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 3.26 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 3.27 @@ -73,7 +67,6 @@ 3.28 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 3.29 mkdir -p $(SA_CLASSDIR); \ 3.30 fi 3.31 - 3.32 # Note: When indented, make tries to execute the '$(shell' comment. 3.33 # In some environments, cmd processors have limited line length. 3.34 # To prevent the javac invocation in the next block from using 3.35 @@ -84,13 +77,12 @@ 3.36 # the initialization of the lists is also done in the same phase 3.37 # using '$(shell rm ...' instead of using the more traditional 3.38 # 'rm ...' rule. 3.39 - $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)) 3.40 - $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) 3.41 - $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) 3.42 - 3.43 - $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) 3.44 - $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) 3.45 - 3.46 + $(shell rm -rf $(AGENT_FILES_LIST)) 3.47 +# gnumake 3.78.1 does not accept the *'s that 3.48 +# are in AGENT_FILES, so use the shell to expand them. 3.49 +# Be extra carefull to not produce too long command lines in the shell! 3.50 + $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) 3.51 + $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) 3.52 $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 3.53 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) 3.54 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 3.55 @@ -106,4 +98,4 @@ 3.56 clean: 3.57 rm -rf $(SA_CLASSDIR) 3.58 rm -rf $(GENERATED)/sa-jdi.jar 3.59 - rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) 3.60 + rm -rf $(AGENT_FILES_LIST)
4.1 --- a/make/windows/makefiles/sa.make Thu Sep 29 09:53:56 2011 -0700 4.2 +++ b/make/windows/makefiles/sa.make Thu Sep 29 13:47:57 2011 -0700 4.3 @@ -52,12 +52,11 @@ 4.4 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space 4.5 # at the end of SA version string and causes a version mismatch with the target VM version. 4.6 4.7 -$(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\) 4.8 +$(GENERATED)\sa-jdi.jar: $(AGENT_FILES:/=\) 4.9 @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) 4.10 @echo ...Building sa-jdi.jar 4.11 @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... 4.12 - @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) 4.13 - @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) 4.14 + @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES:/=\) 4.15 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 4.16 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) 4.17 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
