Mercurial > hg > truffle

comparison make/windows/projectfiles/common/Makefile @ 7202:b7ff5879152e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
7200:dd38cfd12c3a 7202:b7ff5879152e
69 69
70 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) 70 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
71 71
72 !include $(HOTSPOTWORKSPACE)/make/hotspot_version 72 !include $(HOTSPOTWORKSPACE)/make/hotspot_version
73 73
74 !if "$(USER_RELEASE_SUFFIX)" != ""
75 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)
76 !else
77 HOTSPOT_BUILD_VERSION = internal
78 !endif
74 !if "$(HOTSPOT_RELEASE_VERSION)" != "" 79 !if "$(HOTSPOT_RELEASE_VERSION)" != ""
75 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)" 80 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
76 !else 81 !else
77 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)" 82 HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\""
78 !endif
79 !if "$(USER_RELEASE_SUFFIX)" != ""
80 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
81 !else
82 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
83 !endif
84 !if "$(HOTSPOT_BUILD_VERSION)" != ""
85 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
86 !endif 83 !endif
87 !if "$(JRE_RELEASE_VERSION)" != "" 84 !if "$(JRE_RELEASE_VERSION)" != ""
88 JRE_RELEASE_VERSION="$(JRE_RELEASE_VERSION)" 85 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
89 !else 86 !else
90 JRE_RELEASE_VERSION="$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)" 87 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\""
91 !endif 88 !endif
92 89
93 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, 90 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set,
94 # and if it is not see if we have the src/closed directory 91 # and if it is not see if we have the src/closed directory
95 !if "$(HOTSPOT_VM_DISTRO)" != "" 92 !if "$(HOTSPOT_VM_DISTRO)" != ""
96 HOTSPOT_VM_DISTRO="$(HOTSPOT_VM_DISTRO)" 93 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
97 !else 94 !else
98 !if exists($(HOTSPOTWORKSPACE)\src\closed) 95 !if exists($(HOTSPOTWORKSPACE)\src\closed)
99 HOTSPOT_VM_DISTRO="Java HotSpot(TM)" 96 HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
100 !else 97 !else
101 HOTSPOT_VM_DISTRO="OpenJDK" 98 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
102 !endif 99 !endif
103 !endif 100 !endif
104 101
105 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) \ 102 ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
106 -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ 103 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
107 -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
108 -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
109 104
110 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class 105 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
111 @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) 106 @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
112 107
113 clean: 108 clean: