comparison make/linux/makefiles/sa.make @ 3963:098acdf97f09

7096016: SA build still produces "arg list too long" errors Reviewed-by: kvn, never Contributed-by: volker.simonis@gmail.com
author never
date Thu, 29 Sep 2011 13:47:57 -0700
parents 37be97a58393
children a9fed06c01d2
comparison
equal deleted inserted replaced
3962:cb315dc80374 3963:098acdf97f09
41 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar 41 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
42 42
43 # TODO: if it's a modules image, check if SA module is installed. 43 # TODO: if it's a modules image, check if SA module is installed.
44 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules 44 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
45 45
46 # gnumake 3.78.1 does not accept the *s that 46 AGENT_FILES_LIST := $(GENERATED)/agent.classes.list
47 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
48 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
49 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
50
51 AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
52 AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
53 47
54 SA_CLASSDIR = $(GENERATED)/saclasses 48 SA_CLASSDIR = $(GENERATED)/saclasses
55 49
56 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" 50 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
57 51
66 -a "$(SRCARCH)" != "ppc" \ 60 -a "$(SRCARCH)" != "ppc" \
67 -a "$(SRCARCH)" != "zero" ] ; then \ 61 -a "$(SRCARCH)" != "zero" ] ; then \
68 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 62 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
69 fi 63 fi
70 64
71 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 65 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
72 $(QUIETLY) echo "Making $@" 66 $(QUIETLY) echo "Making $@"
73 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 67 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
74 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 68 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
75 exit 1; \ 69 exit 1; \
76 fi 70 fi
80 exit 1; \ 74 exit 1; \
81 fi 75 fi
82 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 76 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
83 mkdir -p $(SA_CLASSDIR); \ 77 mkdir -p $(SA_CLASSDIR); \
84 fi 78 fi
85
86 # Note: When indented, make tries to execute the '$(shell' comment. 79 # Note: When indented, make tries to execute the '$(shell' comment.
87 # In some environments, cmd processors have limited line length. 80 # In some environments, cmd processors have limited line length.
88 # To prevent the javac invocation in the next block from using 81 # To prevent the javac invocation in the next block from using
89 # a very long cmd line, we use javac's @file-list option. We 82 # a very long cmd line, we use javac's @file-list option. We
90 # generate the file lists using make's built-in 'foreach' control 83 # generate the file lists using make's built-in 'foreach' control
91 # flow which also avoids cmd processor line length issues. Since 84 # flow which also avoids cmd processor line length issues. Since
92 # the 'foreach' is done as part of make's macro expansion phase, 85 # the 'foreach' is done as part of make's macro expansion phase,
93 # the initialization of the lists is also done in the same phase 86 # the initialization of the lists is also done in the same phase
94 # using '$(shell rm ...' instead of using the more traditional 87 # using '$(shell rm ...' instead of using the more traditional
95 # 'rm ...' rule. 88 # 'rm ...' rule.
96 $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)) 89 $(shell rm -rf $(AGENT_FILES_LIST))
97 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) 90 # gnumake 3.78.1 does not accept the *'s that
98 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) 91 # are in AGENT_FILES, so use the shell to expand them.
99 92 # Be extra carefull to not produce too long command lines in the shell!
100 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) 93 $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
101 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) 94 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
102
103 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 95 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
104 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) 96 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
105 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 97 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
106 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql 98 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
107 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources 99 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
116 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext 108 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
117 109
118 clean: 110 clean:
119 rm -rf $(SA_CLASSDIR) 111 rm -rf $(SA_CLASSDIR)
120 rm -rf $(GENERATED)/sa-jdi.jar 112 rm -rf $(GENERATED)/sa-jdi.jar
121 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) 113 rm -rf $(AGENT_FILES_LIST)