Mercurial > hg > graal-jvmci-8
comparison make/linux/makefiles/sa.make @ 1774:ea175c1b79ce
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 | 126ea7725993 |
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. |
46 # gnumake 3.78.1 does not accept the *s that | 46 # gnumake 3.78.1 does not accept the *s that |
47 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them | 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)) | 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)) | 49 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) |
50 | 50 |
51 AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list | |
52 AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list | |
53 | |
51 SA_CLASSDIR = $(GENERATED)/saclasses | 54 SA_CLASSDIR = $(GENERATED)/saclasses |
52 | 55 |
53 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" | 56 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" |
54 | 57 |
55 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties | 58 SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties |
63 -a "$(SRCARCH)" != "ppc" \ | 66 -a "$(SRCARCH)" != "ppc" \ |
64 -a "$(SRCARCH)" != "zero" ] ; then \ | 67 -a "$(SRCARCH)" != "zero" ] ; then \ |
65 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ | 68 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ |
66 fi | 69 fi |
67 | 70 |
68 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) | 71 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean |
69 $(QUIETLY) echo "Making $@" | 72 $(QUIETLY) echo "Making $@" |
70 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ | 73 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ |
71 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ | 74 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ |
72 exit 1; \ | 75 exit 1; \ |
73 fi | 76 fi |
77 exit 1; \ | 80 exit 1; \ |
78 fi | 81 fi |
79 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ | 82 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ |
80 mkdir -p $(SA_CLASSDIR); \ | 83 mkdir -p $(SA_CLASSDIR); \ |
81 fi | 84 fi |
82 | 85 |
83 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) | 86 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) |
84 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) | 87 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) |
85 | 88 |
89 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) | |
90 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) | |
91 | |
86 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer | 92 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
87 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) | 93 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) |
88 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js | 94 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
89 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql | 95 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql |
90 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources | 96 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
96 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext | 102 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext |
97 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext | 103 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext |
98 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext | 104 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext |
99 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext | 105 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext |
100 | 106 |
107 agent_files_preclean: | |
108 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) | |
109 | |
101 clean: | 110 clean: |
102 rm -rf $(SA_CLASSDIR) | 111 rm -rf $(SA_CLASSDIR) |
103 rm -rf $(GENERATED)/sa-jdi.jar | 112 rm -rf $(GENERATED)/sa-jdi.jar |
113 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) |