Mercurial > hg > truffle

comparison make/windows/build.make @ 3310:69e41359aef0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6986065: Rebrand exe/dll company names Summary: Fixed Windows exe/dll right-click properties. "Oracle Corporation" for company name in jdk7, but "Sun Microsystems, Inc." for jdk6. Reviewed-by: phh, acorn
author zgu
date Tue, 03 May 2011 13:01:41 -0400
parents 34bd82eba3bb
children 76841bdd5f3e 7292cff45988 d652a62d6e03
comparison
equal deleted inserted replaced
3303:e534ac80e49a 3310:69e41359aef0
1 # 1 #
2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1998, 2011, 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.
123 123
124 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro 124 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
125 # or make/hotspot_distro. 125 # or make/hotspot_distro.
126 !ifndef HOTSPOT_VM_DISTRO 126 !ifndef HOTSPOT_VM_DISTRO
127 !if exists($(WorkSpace)\src\closed) 127 !if exists($(WorkSpace)\src\closed)
128
129 # if the build is for JDK6 or earlier version, it should include jdk6_hotspot_distro,
130 # instead of hotspot_distro.
131 JDK6_OR_EARLIER=0
132 !if "$(JDK_MAJOR_VERSION)" != "" && "$(JDK_MINOR_VERSION)" != "" && "$(JDK_MICRO_VERSION)" != ""
133 !if $(JDK_MAJOR_VERSION) == 1 && $(JDK_MINOR_VERSION) < 7
134 JDK6_OR_EARLIER=1
135 !endif
136 !else
137 !if $(JDK_MAJOR_VER) == 1 && $(JDK_MINOR_VER) < 7
138 JDK6_OR_EARLIER=1
139 !endif
140 !endif
141
142 !if $(JDK6_OR_EARLIER) == 1
143 !include $(WorkSpace)\make\jdk6_hotspot_distro
144 !else
128 !include $(WorkSpace)\make\hotspot_distro 145 !include $(WorkSpace)\make\hotspot_distro
146 !endif
129 !else 147 !else
130 !include $(WorkSpace)\make\openjdk_distro 148 !include $(WorkSpace)\make\openjdk_distro
131 !endif 149 !endif
132 !endif 150 !endif
133 151
258 $(variantDir)\local.make: checks 276 $(variantDir)\local.make: checks
259 @ echo # Generated file > $@ 277 @ echo # Generated file > $@
260 @ echo Variant=$(realVariant) >> $@ 278 @ echo Variant=$(realVariant) >> $@
261 @ echo WorkSpace=$(WorkSpace) >> $@ 279 @ echo WorkSpace=$(WorkSpace) >> $@
262 @ echo BootStrapDir=$(BootStrapDir) >> $@ 280 @ echo BootStrapDir=$(BootStrapDir) >> $@
263 @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@ 281 @ if "$(USERNAME)" NEQ "" echo BuildUser=$(USERNAME) >> $@
264 @ echo HS_VER=$(HS_VER) >> $@ 282 @ echo HS_VER=$(HS_VER) >> $@
265 @ echo HS_DOTVER=$(HS_DOTVER) >> $@ 283 @ echo HS_DOTVER=$(HS_DOTVER) >> $@
266 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ 284 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@
267 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ 285 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@
268 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ 286 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@