Mercurial > hg > truffle
annotate make/solaris/makefiles/sa.make @ 2471:37be97a58393
7010849: 5/5 Extraneous javac source/target options when building sa-jdi
Summary: Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options.
Reviewed-by: dholmes, dcubed
| author | andrew |
|---|---|
| date | Fri, 01 Apr 2011 15:15:37 -0700 |
| parents | 2966dab85b3e |
| children | 098acdf97f09 |
| rev | line source |
|---|---|
| 0 | 1 # |
|
2471
37be97a58393
7010849: 5/5 Extraneous javac source/target options when building sa-jdi
andrew
parents:
1804
diff
changeset
|
2 # Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 # | |
| 5 # This code is free software; you can redistribute it and/or modify it | |
| 6 # under the terms of the GNU General Public License version 2 only, as | |
| 7 # published by the Free Software Foundation. | |
| 8 # | |
| 9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 # version 2 for more details (a copy is included in the LICENSE file that | |
| 13 # accompanied this code). | |
| 14 # | |
| 15 # You should have received a copy of the GNU General Public License version | |
| 16 # 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 # | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
diff
changeset
|
21 # questions. |
| 0 | 22 # |
| 23 # | |
| 24 | |
| 25 # This makefile (sa.make) is included from the sa.make in the | |
| 26 # build directories. | |
| 27 | |
| 28 # This makefile is used to build Serviceability Agent java code | |
| 29 # and generate JNI header file for native methods. | |
| 30 | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
31 include $(GAMMADIR)/make/solaris/makefiles/rules.make |
| 0 | 32 AGENT_DIR = $(GAMMADIR)/agent |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
33 include $(GAMMADIR)/make/sa.files |
| 0 | 34 GENERATED = ../generated |
| 35 | |
| 36 # tools.jar is needed by the JDI - SA binding | |
| 37 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar | |
| 38 | |
| 1642 | 39 # TODO: if it's a modules image, check if SA module is installed. |
| 40 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules | |
| 41 | |
| 0 | 42 # gnumake 3.78.1 does not accept the *s that |
| 311 | 43 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them |
| 44 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) | |
| 45 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) | |
| 0 | 46 |
|
1774
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
47 AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list |
|
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
48 AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list |
|
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
49 |
| 0 | 50 SA_CLASSDIR = $(GENERATED)/saclasses |
| 51 | |
| 52 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" | |
| 53 | |
| 54 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties | |
| 55 | |
| 56 # if $(AGENT_DIR) does not exist, we don't build SA. | |
| 57 all: | |
| 58 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \ | |
| 59 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | |
| 60 fi | |
| 61 | |
|
1804
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
62 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) |
| 0 | 63 $(QUIETLY) echo "Making $@"; |
| 64 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ | |
| 65 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ | |
| 66 exit 1; \ | |
| 67 fi | |
| 1642 | 68 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \ |
| 0 | 69 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ |
| 70 echo ""; \ | |
| 71 exit 1; \ | |
| 72 fi | |
| 73 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ | |
| 74 mkdir -p $(SA_CLASSDIR); \ | |
| 75 fi | |
|
1774
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
76 |
|
1804
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
77 # Note: When indented, make tries to execute the '$(shell' comment. |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
78 # In some environments, cmd processors have limited line length. |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
79 # To prevent the javac invocation in the next block from using |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
80 # a very long cmd line, we use javac's @file-list option. We |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
81 # generate the file lists using make's built-in 'foreach' control |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
82 # flow which also avoids cmd processor line length issues. Since |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
83 # the 'foreach' is done as part of make's macro expansion phase, |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
84 # the initialization of the lists is also done in the same phase |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
85 # using '$(shell rm ...' instead of using the more traditional |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
86 # 'rm ...' rule. |
|
2966dab85b3e
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
dcubed
parents:
1774
diff
changeset
|
87 $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)) |
|
1774
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
88 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) |
|
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
89 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) |
|
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
90 |
|
2471
37be97a58393
7010849: 5/5 Extraneous javac source/target options when building sa-jdi
andrew
parents:
1804
diff
changeset
|
91 $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) |
|
37be97a58393
7010849: 5/5 Extraneous javac source/target options when building sa-jdi
andrew
parents:
1804
diff
changeset
|
92 $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) |
| 311 | 93 |
| 0 | 94 $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
| 95 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) | |
| 311 | 96 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
| 97 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql | |
| 98 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources | |
| 99 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/* | |
| 100 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/ | |
| 101 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/ | |
| 0 | 102 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . |
| 103 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector | |
| 104 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal | |
| 105 | |
| 106 clean: | |
| 107 rm -rf $(SA_CLASSDIR) | |
| 108 rm -rf $(GENERATED)/sa-jdi.jar | |
|
1774
ea175c1b79ce
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?)
dcubed
parents:
1642
diff
changeset
|
109 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) |