Mercurial > hg > truffle
annotate make/windows/makefiles/projectcreator.make @ 12014:31f3b1e1c5e5
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 |
rev | line source |
---|---|
0 | 1 # |
7951 | 2 # Copyright (c) 1999, 2013, 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:
844
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
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:
844
diff
changeset
|
21 # questions. |
10405 | 22 # |
0 | 23 # |
24 | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
25 !include $(WorkSpace)/make/windows/makefiles/rules.make |
0 | 26 |
27 # This is used externally by both batch and IDE builds, so can't | |
28 # reference any of the HOTSPOTWORKSPACE, HOTSPOTBUILDSPACE, | |
29 # HOTSPOTRELEASEBINDEST, or HOTSPOTDEBUGBINDEST environment variables. | |
30 | |
1972 | 31 ProjectCreatorSources=\ |
32 $(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \ | |
6801 | 33 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreator.java \ |
34 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC7.java \ | |
35 $(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC10.java \ | |
1972 | 36 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \ |
37 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \ | |
38 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \ | |
39 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC9.java \ | |
2393 | 40 $(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC10.java \ |
1972 | 41 $(WorkSpace)\src\share\tools\ProjectCreator\Util.java \ |
42 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \ | |
43 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java | |
0 | 44 |
45 # This is only used internally | |
1972 | 46 ProjectCreatorIncludesPRIVATE=\ |
12014
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
47 -relativeAltSrcInclude src\closed \ |
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
48 -altRelativeInclude share\vm \ |
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
49 -altRelativeInclude os\windows\vm \ |
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
50 -altRelativeInclude os_cpu\windows_$(Platform_arch)\vm \ |
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
51 -altRelativeInclude cpu\$(Platform_arch)\vm \ |
1972 | 52 -relativeInclude src\share\vm \ |
4084
c17bc65648de
7112308: Fix Visual Studio build for precompiled header
brutisso
parents:
2393
diff
changeset
|
53 -relativeInclude src\share\vm\precompiled \ |
5978
51612f0c0a79
7148488: Whitebox tests for the Diagnostic Framework Parser
nloodin
parents:
4891
diff
changeset
|
54 -relativeInclude src\share\vm\prims\wbtestmethods \ |
0 | 55 -relativeInclude src\share\vm\prims \ |
56 -relativeInclude src\os\windows\vm \ | |
57 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ | |
1972 | 58 -relativeInclude src\cpu\$(Platform_arch)\vm \ |
59 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ | |
6801 | 60 -relativeSrcInclude src \ |
61 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \ | |
62 -ignorePath $(HOTSPOTBUILDSPACE) \ | |
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 | |
10405 | 76 |
0 | 77 |
78 # This is referenced externally by both the IDE and batch builds | |
1972 | 79 ProjectCreatorOptions= |
0 | 80 |
81 # This is used externally, but only by the IDE builds, so we can | |
82 # reference environment variables which aren't defined in the batch | |
83 # build process. | |
84 | |
1972 | 85 ProjectCreatorIDEOptions = \ |
0 | 86 -useToGeneratePch java.cpp \ |
87 -disablePch os_windows.cpp \ | |
88 -disablePch os_windows_$(Platform_arch).cpp \ | |
89 -disablePch osThread_windows.cpp \ | |
90 -disablePch bytecodeInterpreter.cpp \ | |
91 -disablePch bytecodeInterpreterWithChecks.cpp \ | |
1972 | 92 -disablePch getThread_windows_$(Platform_arch).cpp \ |
10405 | 93 -disablePch_compiler2 opcodes.cpp |
0 | 94 |
12014
31f3b1e1c5e5
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
dcubed
parents:
10405
diff
changeset
|
95 # Common options for the IDE builds for c1, and c2 |
1972 | 96 ProjectCreatorIDEOptions=\ |
97 $(ProjectCreatorIDEOptions) \ | |
0 | 98 -sourceBase $(HOTSPOTWORKSPACE) \ |
1972 | 99 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ |
6801 | 100 -buildSpace $(HOTSPOTBUILDSPACE) \ |
0 | 101 -startAt src \ |
1972 | 102 -compiler $(VcVersion) \ |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
103 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ |
0 | 104 -jdkTargetRoot $(HOTSPOTJDKDIST) \ |
105 -define ALIGN_STACK_FRAMES \ | |
106 -define VM_LITTLE_ENDIAN \ | |
4891
719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
erikj
parents:
4800
diff
changeset
|
107 -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ |
1972 | 108 -ignoreFile jsig.c \ |
109 -ignoreFile jvmtiEnvRecommended.cpp \ | |
110 -ignoreFile jvmtiEnvStub.cpp \ | |
111 -ignoreFile globalDefinitions_gcc.hpp \ | |
112 -ignoreFile globalDefinitions_sparcWorks.hpp \ | |
113 -ignoreFile version.rc \ | |
114 -ignoreFile Xusage.txt \ | |
115 -define TARGET_ARCH_x86 \ | |
116 -define TARGET_OS_ARCH_windows_x86 \ | |
117 -define TARGET_OS_FAMILY_windows \ | |
118 -define TARGET_COMPILER_visCPP \ | |
10405 | 119 -define INCLUDE_TRACE=1 \ |
1972 | 120 $(ProjectCreatorIncludesPRIVATE) |
0 | 121 |
122 # Add in build-specific options | |
123 !if "$(BUILDARCH)" == "i486" | |
1972 | 124 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
125 -platformName Win32 \ |
1972 | 126 -define IA32 \ |
127 -ignorePath x86_64 \ | |
128 -define TARGET_ARCH_MODEL_x86_32 | |
129 !else | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
130 !if "$(BUILDARCH)" == "amd64" |
1972 | 131 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
132 -platformName x64 \ |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
133 -define AMD64 \ |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
134 -define _LP64 \ |
1972 | 135 -ignorePath x86_32 \ |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
136 -define TARGET_ARCH_MODEL_x86_64 \ |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
137 -define TARGET_OS_ARCH_MODEL_windows_x86_64 |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
138 !endif |
0 | 139 !endif |
140 | |
1972 | 141 ProjectCreatorIDEOptionsIgnoreCompiler1=\ |
6801 | 142 -ignorePath_TARGET compiler1 \ |
143 -ignorePath_TARGET tiered \ | |
1972 | 144 -ignorePath_TARGET c1_ |
145 | |
146 ProjectCreatorIDEOptionsIgnoreCompiler2=\ | |
6801 | 147 -ignorePath_TARGET compiler2 \ |
148 -ignorePath_TARGET tiered \ | |
1972 | 149 -ignorePath_TARGET src/share/vm/opto \ |
150 -ignorePath_TARGET src/share/vm/libadt \ | |
151 -ignorePath_TARGET adfiles \ | |
152 -ignoreFile_TARGET bcEscapeAnalyzer.cpp \ | |
153 -ignoreFile_TARGET bcEscapeAnalyzer.hpp \ | |
154 -ignorePath_TARGET chaitin \ | |
155 -ignorePath_TARGET c2_ \ | |
156 -ignorePath_TARGET runtime_ \ | |
157 -ignoreFile_TARGET ciTypeFlow.cpp \ | |
158 -ignoreFile_TARGET ciTypeFlow.hpp \ | |
159 -ignoreFile_TARGET $(Platform_arch_model).ad | |
160 | |
161 ################################################## | |
0 | 162 # Client(C1) compiler specific options |
163 ################################################## | |
1972 | 164 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
0 | 165 -define_compiler1 COMPILER1 \ |
1972 | 166 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) |
0 | 167 |
168 ################################################## | |
169 # Server(C2) compiler specific options | |
170 ################################################## | |
171 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. | |
1972 | 172 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
0 | 173 -define_compiler2 COMPILER2 \ |
174 -additionalFile_compiler2 $(Platform_arch_model).ad \ | |
6801 | 175 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ |
176 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ | |
177 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ | |
178 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \ | |
179 -additionalFile_compiler2 ad_$(Platform_arch_model)_format.cpp \ | |
180 -additionalFile_compiler2 ad_$(Platform_arch_model)_gen.cpp \ | |
181 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \ | |
182 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \ | |
183 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \ | |
184 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \ | |
185 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \ | |
1972 | 186 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) |
0 | 187 |
188 # Add in the jvmti (JSR-163) options | |
189 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated | |
190 # so the programmer can diff it with jvmtiEnv.cpp to be sure the | |
191 # code merge was done correctly (@see jvmti.make and jvmtiEnvFill.java). | |
192 # If so, they would then check it in as a new version of jvmtiEnv.cpp. | |
1972 | 193 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
6801 | 194 -additionalFile jvmtiEnv.hpp \ |
195 -additionalFile jvmtiEnter.cpp \ | |
196 -additionalFile jvmtiEnterTrace.cpp \ | |
197 -additionalFile jvmti.h \ | |
10405 | 198 -additionalFile bytecodeInterpreterWithChecks.cpp \ |
199 -additionalFile traceEventClasses.hpp \ | |
200 -additionalFile traceEventIds.hpp \ | |
201 !if "$(OPENJDK)" != "true" | |
202 -additionalFile traceRequestables.hpp \ | |
203 -additionalFile traceEventControl.hpp \ | |
204 -additionalFile traceProducer.cpp \ | |
205 !endif | |
206 -additionalFile traceTypes.hpp |