Mercurial > hg > truffle
annotate make/windows/projectfiles/common/Makefile @ 7202:b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
Summary: Makefile produces unmatched quotes due to nmake bug
Reviewed-by: jwilhelm, brutisso
| author | neliasso |
|---|---|
| date | Thu, 06 Dec 2012 09:50:08 +0100 |
| parents | b9a9ed0f8eeb |
| children | aabf54ccedb1 |
| rev | line source |
|---|---|
| 0 | 1 # |
|
6842
b9a9ed0f8eeb
7197424: update copyright year to match last edit in jdk8 hotspot repository
mikael
parents:
6606
diff
changeset
|
2 # Copyright (c) 1999, 2012, 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:
971
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
971
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:
971
diff
changeset
|
21 # questions. |
| 0 | 22 # |
| 23 # | |
| 24 | |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
25 !ifdef LOCAL_MAKE |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
26 !include $(LOCAL_MAKE) |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
27 !endif |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
28 |
| 1972 | 29 |
| 0 | 30 WorkSpace=$(HOTSPOTWORKSPACE) |
| 31 | |
| 32 !ifdef ALT_BOOTDIR | |
| 33 BootStrapDir=$(ALT_BOOTDIR) | |
| 34 !else | |
| 35 !ifdef BOOTDIR | |
| 36 BootStrapDir=$(BOOTDIR) | |
| 37 !else | |
| 38 !ifdef JAVA_HOME | |
| 39 BootStrapDir=$(JAVA_HOME) | |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
40 !else |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
41 !ifdef HOTSPOTJDKDIST |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
42 BootStrapDir=$(HOTSPOTJDKDIST) |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
43 !endif |
| 0 | 44 !endif |
| 45 !endif | |
| 46 !endif | |
| 47 | |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
48 |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
49 |
| 1972 | 50 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
51 !include $(WorkSpace)/make/windows/makefiles/compile.make |
| 0 | 52 |
| 53 # Pick up rules for building JVMTI (JSR-163) | |
| 1972 | 54 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
55 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make |
| 0 | 56 |
| 57 !if "$(Variant)" == "compiler2" | |
| 58 # Pick up rules for building adlc | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
59 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
| 0 | 60 !endif |
| 61 | |
| 62 !if "$(Variant)" == "tiered" | |
| 63 # Pick up rules for building adlc | |
|
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
64 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make |
| 0 | 65 !endif |
| 66 | |
|
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
67 HS_INTERNAL_NAME=jvm |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
68 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/launcher.make |
|
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1978
diff
changeset
|
69 |
| 1972 | 70 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) |
| 0 | 71 |
| 72 !include $(HOTSPOTWORKSPACE)/make/hotspot_version | |
| 73 | |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
74 !if "$(USER_RELEASE_SUFFIX)" != "" |
|
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
75 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) |
| 0 | 76 !else |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
77 HOTSPOT_BUILD_VERSION = internal |
| 0 | 78 !endif |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
79 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
|
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
80 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
|
1977
c7db7adb83b4
6987107: Add variable to add to but not modify non-fcs version string
ohair
parents:
1552
diff
changeset
|
81 !else |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
82 HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\"" |
| 0 | 83 !endif |
| 84 !if "$(JRE_RELEASE_VERSION)" != "" | |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
85 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
| 0 | 86 !else |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
87 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
| 0 | 88 !endif |
| 89 | |
| 90 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, | |
| 91 # and if it is not see if we have the src/closed directory | |
| 92 !if "$(HOTSPOT_VM_DISTRO)" != "" | |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
93 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
| 0 | 94 !else |
| 95 !if exists($(HOTSPOTWORKSPACE)\src\closed) | |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
96 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\"" |
| 0 | 97 !else |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
98 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\"" |
| 0 | 99 !endif |
| 100 !endif | |
| 101 | |
|
7202
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
102 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
|
b7ff5879152e
8003934: Fix generation of malformed options to Projectcreator
neliasso
parents:
6842
diff
changeset
|
103 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) |
| 0 | 104 |
|
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
105 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class |
|
6606
98625323d3a3
7190512: Fix for 7181175 broke hotspot/make/windows/create.bat builds
tbell
parents:
2233
diff
changeset
|
106 @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) |
| 0 | 107 |
| 108 clean: | |
| 1972 | 109 @rm -rf $(HOTSPOTBUILDSPACE)/classes |
|
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
110 @rm -r $(HOTSPOTBUILDSPACE)/$(ProjectFile) |
| 0 | 111 |
| 1972 | 112 $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources) |
| 0 | 113 @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes |
| 114 @mkdir $(HOTSPOTBUILDSPACE)\classes | |
| 1972 | 115 @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources) |
| 0 | 116 |
| 117 FORCE: |