Mercurial > hg > graal-compiler

comparison make/solaris/makefiles/sa.make @ 1774:ea175c1b79ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6561870: 3/3 Long javac compile lines fail due to command line length issues (agent compiles?) Summary: Use javac's @filename construct to avoid long compile lines Reviewed-by: ohair, twisti, never Contributed-by: doko@ubuntu.com
author dcubed
date Wed, 08 Sep 2010 08:34:57 -0700
parents 0e7d2a08b605
children 2966dab85b3e
comparison
equal deleted inserted replaced
1771:07551f490c76 1774:ea175c1b79ce
1 # 1 #
2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 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 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
42 # gnumake 3.78.1 does not accept the *s that 42 # gnumake 3.78.1 does not accept the *s that
43 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them 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)) 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)) 45 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
46 46
47 AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
48 AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
49
47 SA_CLASSDIR = $(GENERATED)/saclasses 50 SA_CLASSDIR = $(GENERATED)/saclasses
48 51
49 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" 52 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
50 53
51 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties 54 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
54 all: 57 all:
55 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \ 58 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \
56 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 59 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
57 fi 60 fi
58 61
59 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 62 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
60 $(QUIETLY) echo "Making $@"; 63 $(QUIETLY) echo "Making $@";
61 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 64 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
62 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 65 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
63 exit 1; \ 66 exit 1; \
64 fi 67 fi
68 exit 1; \ 71 exit 1; \
69 fi 72 fi
70 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 73 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
71 mkdir -p $(SA_CLASSDIR); \ 74 mkdir -p $(SA_CLASSDIR); \
72 fi 75 fi
73 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) 76
74 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) 77 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
78 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
79
80 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
81 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
75 82
76 $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 83 $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
77 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) 84 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
78 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 85 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
79 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql 86 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
83 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/ 90 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
84 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . 91 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
85 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector 92 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
86 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal 93 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
87 94
95 agent_files_preclean:
96 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
97
88 clean: 98 clean:
89 rm -rf $(SA_CLASSDIR) 99 rm -rf $(SA_CLASSDIR)
90 rm -rf $(GENERATED)/sa-jdi.jar 100 rm -rf $(GENERATED)/sa-jdi.jar
101 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)