Mercurial > hg > truffle

comparison make/windows/makefiles/projectcreator.make @ 6948:e522a00b91aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 957c266d8bc5 b9a9ed0f8eeb
children 5a95c784febf
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 # 1 #
2 # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2012, 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.
27 # This is used externally by both batch and IDE builds, so can't 27 # This is used externally by both batch and IDE builds, so can't
28 # reference any of the HOTSPOTWORKSPACE, HOTSPOTBUILDSPACE, 28 # reference any of the HOTSPOTWORKSPACE, HOTSPOTBUILDSPACE,
29 # HOTSPOTRELEASEBINDEST, or HOTSPOTDEBUGBINDEST environment variables. 29 # HOTSPOTRELEASEBINDEST, or HOTSPOTDEBUGBINDEST environment variables.
30 30
31 ProjectCreatorSources=\ 31 ProjectCreatorSources=\
32 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTree.java \
33 $(WorkSpace)\src\share\tools\ProjectCreator\DirectoryTreeNode.java \
34 $(WorkSpace)\src\share\tools\ProjectCreator\FileFormatException.java \
35 $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \ 32 $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \
33 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreator.java \
34 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC7.java \
35 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC10.java \
36 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \ 36 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \
37 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC6.java \
38 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \ 37 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \
39 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \ 38 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \
40 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC9.java \ 39 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC9.java \
41 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC10.java \ 40 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC10.java \
42 $(WorkSpace)\src\share\tools\ProjectCreator\Util.java \ 41 $(WorkSpace)\src\share\tools\ProjectCreator\Util.java \
55 -relativeInclude src\share\vm\prims \ 54 -relativeInclude src\share\vm\prims \
56 -relativeInclude src\os\windows\vm \ 55 -relativeInclude src\os\windows\vm \
57 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ 56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \
58 -relativeInclude src\cpu\$(Platform_arch)\vm \ 57 -relativeInclude src\cpu\$(Platform_arch)\vm \
59 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ 58 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \
60 -ignorePath $(HOTSPOTBUILDSPACE)/%f/generated \ 59 -relativeSrcInclude src \
61 -ignorePath src\share\vm\adlc \ 60 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \
62 -ignorePath src\share\vm\shark \ 61 -ignorePath $(HOTSPOTBUILDSPACE) \
63 -ignorePath posix 62 -ignorePath launcher \
63 -ignorePath share\vm\adlc \
64 -ignorePath share\vm\shark \
65 -ignorePath share\tools \
66 -ignorePath solaris \
67 -ignorePath posix \
68 -ignorePath sparc \
69 -ignorePath linux \
70 -ignorePath bsd \
71 -ignorePath osx \
72 -ignorePath arm \
73 -ignorePath ppc \
74 -ignorePath zero \
75 -hidePath .hg
76
64 77
65 # This is referenced externally by both the IDE and batch builds 78 # This is referenced externally by both the IDE and batch builds
66 ProjectCreatorOptions= 79 ProjectCreatorOptions=
67 80
68 # This is used externally, but only by the IDE builds, so we can 81 # This is used externally, but only by the IDE builds, so we can
82 # Common options for the IDE builds for core, c1, and c2 95 # Common options for the IDE builds for core, c1, and c2
83 ProjectCreatorIDEOptions=\ 96 ProjectCreatorIDEOptions=\
84 $(ProjectCreatorIDEOptions) \ 97 $(ProjectCreatorIDEOptions) \
85 -sourceBase $(HOTSPOTWORKSPACE) \ 98 -sourceBase $(HOTSPOTWORKSPACE) \
86 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ 99 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \
100 -buildSpace $(HOTSPOTBUILDSPACE) \
87 -startAt src \ 101 -startAt src \
88 -compiler $(VcVersion) \ 102 -compiler $(VcVersion) \
89 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ 103 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \
90 -jdkTargetRoot $(HOTSPOTJDKDIST) \ 104 -jdkTargetRoot $(HOTSPOTJDKDIST) \
91 -define ALIGN_STACK_FRAMES \ 105 -define ALIGN_STACK_FRAMES \
101 -ignoreFile Xusage.txt \ 115 -ignoreFile Xusage.txt \
102 -define TARGET_ARCH_x86 \ 116 -define TARGET_ARCH_x86 \
103 -define TARGET_OS_ARCH_windows_x86 \ 117 -define TARGET_OS_ARCH_windows_x86 \
104 -define TARGET_OS_FAMILY_windows \ 118 -define TARGET_OS_FAMILY_windows \
105 -define TARGET_COMPILER_visCPP \ 119 -define TARGET_COMPILER_visCPP \
120 -define INCLUDE_TRACE \
106 $(ProjectCreatorIncludesPRIVATE) 121 $(ProjectCreatorIncludesPRIVATE)
107 122
108 # Add in build-specific options 123 # Add in build-specific options
109 !if "$(BUILDARCH)" == "i486" 124 !if "$(BUILDARCH)" == "i486"
110 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 125 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
123 -define TARGET_OS_ARCH_MODEL_windows_x86_64 138 -define TARGET_OS_ARCH_MODEL_windows_x86_64
124 !endif 139 !endif
125 !endif 140 !endif
126 141
127 ProjectCreatorIDEOptionsIgnoreCompiler1=\ 142 ProjectCreatorIDEOptionsIgnoreCompiler1=\
143 -ignorePath_TARGET compiler1 \
144 -ignorePath_TARGET tiered \
128 -ignorePath_TARGET c1_ 145 -ignorePath_TARGET c1_
129 146
130 ProjectCreatorIDEOptionsIgnoreCompiler2=\ 147 ProjectCreatorIDEOptionsIgnoreCompiler2=\
148 -ignorePath_TARGET compiler2 \
149 -ignorePath_TARGET tiered \
131 -ignorePath_TARGET src/share/vm/opto \ 150 -ignorePath_TARGET src/share/vm/opto \
132 -ignorePath_TARGET src/share/vm/libadt \ 151 -ignorePath_TARGET src/share/vm/libadt \
133 -ignorePath_TARGET adfiles \ 152 -ignorePath_TARGET adfiles \
134 -ignoreFile_TARGET bcEscapeAnalyzer.cpp \ 153 -ignoreFile_TARGET bcEscapeAnalyzer.cpp \
135 -ignoreFile_TARGET bcEscapeAnalyzer.hpp \ 154 -ignoreFile_TARGET bcEscapeAnalyzer.hpp \
207 ################################################## 226 ##################################################
208 # Client(C1) compiler specific options 227 # Client(C1) compiler specific options
209 ################################################## 228 ##################################################
210 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 229 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
211 -define_compiler1 COMPILER1 \ 230 -define_compiler1 COMPILER1 \
231 -ignorePath_compiler1 core \
212 -ignorePath_compiler1 src/share/vm/graal \ 232 -ignorePath_compiler1 src/share/vm/graal \
213 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) 233 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
214 234
215 ################################################## 235 ##################################################
216 # Graal compiler specific options 236 # Graal compiler specific options
224 # Server(C2) compiler specific options 244 # Server(C2) compiler specific options
225 ################################################## 245 ##################################################
226 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. 246 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
227 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 247 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
228 -define_compiler2 COMPILER2 \ 248 -define_compiler2 COMPILER2 \
249 -ignorePath_compiler2 core \
229 -ignorePath_compiler2 src/share/vm/graal \ 250 -ignorePath_compiler2 src/share/vm/graal \
230 -additionalFile_compiler2 $(Platform_arch_model).ad \ 251 -additionalFile_compiler2 $(Platform_arch_model).ad \
231 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model).cpp \ 252 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \
232 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model).hpp \ 253 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \
233 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_clone.cpp \ 254 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \
234 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_expand.cpp \ 255 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \
235 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_format.cpp \ 256 -additionalFile_compiler2 ad_$(Platform_arch_model)_format.cpp \
236 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_gen.cpp \ 257 -additionalFile_compiler2 ad_$(Platform_arch_model)_gen.cpp \
237 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_misc.cpp \ 258 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \
238 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_peephole.cpp \ 259 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \
239 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles ad_$(Platform_arch_model)_pipeline.cpp \ 260 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \
240 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles adGlobals_$(Platform_arch_model).hpp \ 261 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \
241 -additionalGeneratedFile_compiler2 $(HOTSPOTBUILDSPACE)/%f/generated/adfiles dfa_$(Platform_arch_model).cpp \ 262 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \
242 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) 263 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2)
243 264
244 # Add in the jvmti (JSR-163) options 265 # Add in the jvmti (JSR-163) options
245 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated 266 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated
246 # so the programmer can diff it with jvmtiEnv.cpp to be sure the 267 # so the programmer can diff it with jvmtiEnv.cpp to be sure the
247 # code merge was done correctly (@see jvmti.make and jvmtiEnvFill.java). 268 # code merge was done correctly (@see jvmti.make and jvmtiEnvFill.java).
248 # If so, they would then check it in as a new version of jvmtiEnv.cpp. 269 # If so, they would then check it in as a new version of jvmtiEnv.cpp.
249 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 270 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
250 -additionalGeneratedFile $(HOTSPOTBUILDSPACE)/%f/generated/jvmtifiles jvmtiEnv.hpp \ 271 -additionalFile jvmtiEnv.hpp \
251 -additionalGeneratedFile $(HOTSPOTBUILDSPACE)/%f/generated/jvmtifiles jvmtiEnter.cpp \ 272 -additionalFile jvmtiEnter.cpp \
252 -additionalGeneratedFile $(HOTSPOTBUILDSPACE)/%f/generated/jvmtifiles jvmtiEnterTrace.cpp \ 273 -additionalFile jvmtiEnterTrace.cpp \
253 -additionalGeneratedFile $(HOTSPOTBUILDSPACE)/%f/generated/jvmtifiles jvmti.h \ 274 -additionalFile jvmti.h \
254 -additionalGeneratedFile $(HOTSPOTBUILDSPACE)/%f/generated/jvmtifiles bytecodeInterpreterWithChecks.cpp 275 -additionalFile bytecodeInterpreterWithChecks.cpp