Mercurial > hg > graal-jvmci-8
comparison make/windows/projectfiles/common/Makefile @ 1972:f95d63e2154a
6989984: Use standard include model for Hospot
Summary: Replaced MakeDeps and the includeDB files with more standardized solutions.
Reviewed-by: coleenp, kvn, kamg
author | stefank |
---|---|
date | Tue, 23 Nov 2010 13:22:55 -0800 |
parents | c18cbe5936b8 |
children | 2ca799d83d3c |
comparison
equal
deleted
inserted
replaced
1971:e33f46fc48ed | 1972:f95d63e2154a |
---|---|
1 # | 1 # |
2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1999, 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. |
20 # or visit www.oracle.com if you need additional information or have any | 20 # or visit www.oracle.com if you need additional information or have any |
21 # questions. | 21 # questions. |
22 # | 22 # |
23 # | 23 # |
24 | 24 |
25 !include local.make | |
26 | |
25 WorkSpace=$(HOTSPOTWORKSPACE) | 27 WorkSpace=$(HOTSPOTWORKSPACE) |
26 | 28 |
27 !ifdef ALT_BOOTDIR | 29 !ifdef ALT_BOOTDIR |
28 BootStrapDir=$(ALT_BOOTDIR) | 30 BootStrapDir=$(ALT_BOOTDIR) |
29 !else | 31 !else |
34 BootStrapDir=$(JAVA_HOME) | 36 BootStrapDir=$(JAVA_HOME) |
35 !endif | 37 !endif |
36 !endif | 38 !endif |
37 !endif | 39 !endif |
38 | 40 |
39 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/makedeps.make | 41 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make |
40 | 42 |
41 # Pick up rules for building JVMTI (JSR-163) | 43 # Pick up rules for building JVMTI (JSR-163) |
42 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\jvmtifiles | 44 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles |
43 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make | 45 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make |
44 | 46 |
45 Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH) | 47 Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH) |
46 | 48 |
47 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) | |
48 | |
49 IncludeDBs_base=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_core \ | |
50 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_jvmti \ | |
51 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc \ | |
52 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_serial | |
53 | |
54 # Parallel gc files | |
55 IncludeDBs_gc=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc_parallel \ | |
56 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_shared \ | |
57 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parNew \ | |
58 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ | |
59 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \ | |
60 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_g1 | |
61 | |
62 | |
63 IncludeDBs_kernel =$(IncludeDBs_base) \ | |
64 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 | |
65 | |
66 IncludeDBs_core =$(IncludeDBs_base) $(IncludeDBs_gc) \ | |
67 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_features | |
68 | |
69 IncludeDBs_compiler1=$(IncludeDBs_core) \ | |
70 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 | |
71 | |
72 IncludeDBs_compiler2=$(IncludeDBs_core) \ | |
73 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2 | |
74 | |
75 IncludeDBs_tiered=$(IncludeDBs_core) \ | |
76 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 \ | |
77 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2 | |
78 | |
79 | |
80 !if "$(Variant)" == "compiler1" | |
81 IncludeDBs = $(IncludeDBs_compiler1) | |
82 !endif | |
83 | |
84 !if "$(Variant)" == "compiler2" | 49 !if "$(Variant)" == "compiler2" |
85 IncludeDBs = $(IncludeDBs_compiler2) | |
86 # Pick up rules for building adlc | 50 # Pick up rules for building adlc |
87 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make | 51 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
88 !endif | 52 !endif |
89 | 53 |
90 !if "$(Variant)" == "tiered" | 54 !if "$(Variant)" == "tiered" |
91 IncludeDBs = $(IncludeDBs_tiered) | |
92 # Pick up rules for building adlc | 55 # Pick up rules for building adlc |
93 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make | 56 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
94 !endif | 57 !endif |
95 | 58 |
96 !if "$(Variant)" == "core" | 59 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) |
97 IncludeDBs = $(IncludeDBs_core) | |
98 !endif | |
99 | |
100 !if "$(Variant)" == "kernel" | |
101 IncludeDBs = $(IncludeDBs_kernel) | |
102 !endif | |
103 | 60 |
104 !include $(HOTSPOTWORKSPACE)/make/hotspot_version | 61 !include $(HOTSPOTWORKSPACE)/make/hotspot_version |
105 | 62 |
106 !if "$(HOTSPOT_RELEASE_VERSION)" != "" | 63 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
107 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)" | 64 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)" |
128 !else | 85 !else |
129 HOTSPOT_VM_DISTRO="OpenJDK" | 86 HOTSPOT_VM_DISTRO="OpenJDK" |
130 !endif | 87 !endif |
131 !endif | 88 !endif |
132 | 89 |
133 MakeDepsIDEOptions = $(MakeDepsIDEOptions) \ | 90 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) \ |
134 -includeDB_kernel $(HOTSPOTBUILDSPACE)\includeDB_kernel \ | |
135 -includeDB_core $(HOTSPOTBUILDSPACE)\includeDB_core \ | |
136 -includeDB_compiler1 $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \ | |
137 -includeDB_compiler2 $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \ | |
138 -includeDB_tiered $(HOTSPOTBUILDSPACE)\includeDB_tiered \ | |
139 -platform $(Platform) \ | 91 -platform $(Platform) \ |
140 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ | 92 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ |
141 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \ | 93 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \ |
142 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\" | 94 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\" |
143 | 95 |
144 incls: | 96 $(HOTSPOTBUILDSPACE)/$(ProjectFile): local.make $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class |
145 @mkdir incls | 97 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) |
146 | |
147 includeDB.current $(ProjectFile) Dependencies: local.make $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class \ | |
148 $(IncludeDBs) incls | |
149 @rm -f includeDB $(HOTSPOTBUILDSPACE)\includeDB_kernel \ | |
150 $(HOTSPOTBUILDSPACE)\includeDB_core \ | |
151 $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \ | |
152 $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \ | |
153 $(HOTSPOTBUILDSPACE)\includeDB_tiered | |
154 @cat $(IncludeDBs_kernel) > $(HOTSPOTBUILDSPACE)\includeDB_kernel | |
155 @cat $(IncludeDBs_core) > $(HOTSPOTBUILDSPACE)\includeDB_core | |
156 @cat $(IncludeDBs_compiler1) > $(HOTSPOTBUILDSPACE)\includeDB_compiler1 | |
157 @cat $(IncludeDBs_compiler2) > $(HOTSPOTBUILDSPACE)\includeDB_compiler2 | |
158 @cat $(IncludeDBs_tiered) > $(HOTSPOTBUILDSPACE)\includeDB_tiered | |
159 @echo java.cpp jni.h > includeDB | |
160 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps diffs WinGammaPlatform$(VcVersion) \ | |
161 $(Platform) includeDB.current $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions) | |
162 @rm -f includeDB.current | |
163 @cp includeDB includeDB.current | |
164 | |
165 lists: $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class FORCE | |
166 @if exist incls rmdir /s /q incls | |
167 @rm -f includeDB | |
168 @cat $(IncludeDBs) > includeDB | |
169 @mkdir incls | |
170 @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps WinGammaPlatform$(VcVersion) \ | |
171 $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions) | |
172 @rm -f includeDB.current | |
173 @cp includeDB includeDB.current | |
174 | 98 |
175 clean: | 99 clean: |
176 @rm -rf incls $(HOTSPOTBUILDSPACE)/classes | 100 @rm -rf $(HOTSPOTBUILDSPACE)/classes |
177 @rm -f includeDB includeDB.current $(ProjectFile) Dependencies | 101 @rm -r ../$(ProjectFile) |
178 | 102 |
179 $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources) | 103 $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources) |
180 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes | 104 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes |
181 @mkdir $(HOTSPOTBUILDSPACE)\classes | 105 @mkdir $(HOTSPOTBUILDSPACE)\classes |
182 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources) | 106 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources) |
183 | 107 |
184 FORCE: | 108 FORCE: |