Mercurial > hg > truffle

comparison make/windows/makefiles/projectcreator.make @ 12014:31f3b1e1c5e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio Summary: ProjectCreator tool is modified to support two new options: '-relativeAltSrcInclude' and '-altRelativeInclude' which prevents IDE linker errors. Also fixed some cmd line build linker warnings. Misc cleanups. Reviewed-by: rdurbin, coleenp
author dcubed
date Thu, 08 Aug 2013 09:21:30 -0700
parents f2110083203d
children 3cce976666d9 c062a6e1fa33
comparison
equal deleted inserted replaced
12013:195ff07bc7f6 12014:31f3b1e1c5e5
42 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \ 42 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \
43 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java 43 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java
44 44
45 # This is only used internally 45 # This is only used internally
46 ProjectCreatorIncludesPRIVATE=\ 46 ProjectCreatorIncludesPRIVATE=\
47 -relativeInclude src\closed\share\vm \ 47 -relativeAltSrcInclude src\closed \
48 -relativeInclude src\closed\os\windows\vm \ 48 -altRelativeInclude share\vm \
49 -relativeInclude src\closed\os_cpu\windows_$(Platform_arch)\vm \ 49 -altRelativeInclude os\windows\vm \
50 -relativeInclude src\closed\cpu\$(Platform_arch)\vm \ 50 -altRelativeInclude os_cpu\windows_$(Platform_arch)\vm \
51 -altRelativeInclude cpu\$(Platform_arch)\vm \
51 -relativeInclude src\share\vm \ 52 -relativeInclude src\share\vm \
52 -relativeInclude src\share\vm\precompiled \ 53 -relativeInclude src\share\vm\precompiled \
53 -relativeInclude src\share\vm\prims\wbtestmethods \ 54 -relativeInclude src\share\vm\prims\wbtestmethods \
54 -relativeInclude src\share\vm\prims \ 55 -relativeInclude src\share\vm\prims \
55 -relativeInclude src\os\windows\vm \ 56 -relativeInclude src\os\windows\vm \
89 -disablePch bytecodeInterpreter.cpp \ 90 -disablePch bytecodeInterpreter.cpp \
90 -disablePch bytecodeInterpreterWithChecks.cpp \ 91 -disablePch bytecodeInterpreterWithChecks.cpp \
91 -disablePch getThread_windows_$(Platform_arch).cpp \ 92 -disablePch getThread_windows_$(Platform_arch).cpp \
92 -disablePch_compiler2 opcodes.cpp 93 -disablePch_compiler2 opcodes.cpp
93 94
94 # Common options for the IDE builds for core, c1, and c2 95 # Common options for the IDE builds for c1, and c2
95 ProjectCreatorIDEOptions=\ 96 ProjectCreatorIDEOptions=\
96 $(ProjectCreatorIDEOptions) \ 97 $(ProjectCreatorIDEOptions) \
97 -sourceBase $(HOTSPOTWORKSPACE) \ 98 -sourceBase $(HOTSPOTWORKSPACE) \
98 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ 99 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \
99 -buildSpace $(HOTSPOTBUILDSPACE) \ 100 -buildSpace $(HOTSPOTBUILDSPACE) \
156 -ignoreFile_TARGET ciTypeFlow.cpp \ 157 -ignoreFile_TARGET ciTypeFlow.cpp \
157 -ignoreFile_TARGET ciTypeFlow.hpp \ 158 -ignoreFile_TARGET ciTypeFlow.hpp \
158 -ignoreFile_TARGET $(Platform_arch_model).ad 159 -ignoreFile_TARGET $(Platform_arch_model).ad
159 160
160 ################################################## 161 ##################################################
161 # Without compiler(core) specific options
162 ##################################################
163 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
164 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=core) \
165 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core)
166
167 ##################################################
168 # Client(C1) compiler specific options 162 # Client(C1) compiler specific options
169 ################################################## 163 ##################################################
170 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 164 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
171 -define_compiler1 COMPILER1 \ 165 -define_compiler1 COMPILER1 \
172 -ignorePath_compiler1 core \
173 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) 166 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
174 167
175 ################################################## 168 ##################################################
176 # Server(C2) compiler specific options 169 # Server(C2) compiler specific options
177 ################################################## 170 ##################################################
178 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. 171 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
179 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 172 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
180 -define_compiler2 COMPILER2 \ 173 -define_compiler2 COMPILER2 \
181 -ignorePath_compiler2 core \
182 -additionalFile_compiler2 $(Platform_arch_model).ad \ 174 -additionalFile_compiler2 $(Platform_arch_model).ad \
183 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ 175 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \
184 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ 176 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \
185 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ 177 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \
186 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \ 178 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \