changeset 4579:03ba6eb06186

8011400: missing define OPENJDK for windows builds Reviewed-by: dcubed, sla
author mgronlun
date Fri, 05 Apr 2013 08:53:29 +0200
parents 63c3f7805426
children 5c44c9466675
files make/windows/build.make make/windows/makefiles/trace.make make/windows/projectfiles/common/Makefile
diffstat 3 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/build.make	Tue Feb 26 08:54:03 2013 -0800
+++ b/make/windows/build.make	Fri Apr 05 08:53:29 2013 +0200
@@ -196,6 +196,12 @@
 
 # End VERSIONINFO parameters
 
+# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
+!ifndef OPENJDK
+!if !exists($(WorkSpace)\src\closed)
+OPENJDK=true
+!endif
+!endif
 
 # We don't support SA on ia64, and we can't
 # build it if we are using a version of Vis Studio
@@ -282,6 +288,7 @@
 	@ echo HS_COMPANY=$(COMPANY_NAME)			>> $@
 	@ echo HS_FILEDESC=$(HS_FILEDESC)			>> $@
 	@ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)		>> $@
+	@ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK)	>> $@
 	@ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT)		>> $@
 	@ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION)	>> $@
 	@ echo HS_BUILD_VER=$(HS_BUILD_VER)			>> $@
--- a/make/windows/makefiles/trace.make	Tue Feb 26 08:54:03 2013 -0800
+++ b/make/windows/makefiles/trace.make	Fri Apr 05 08:53:29 2013 +0200
@@ -116,8 +116,6 @@
 # #########################################################################
 
 cleanall :
-!if "$(INCLUDE_TRACE)" == "1"
 	rm $(TraceGeneratedFiles)
-!endif
 
 
--- a/make/windows/projectfiles/common/Makefile	Tue Feb 26 08:54:03 2013 -0800
+++ b/make/windows/projectfiles/common/Makefile	Fri Apr 05 08:53:29 2013 +0200
@@ -45,12 +45,11 @@
 !endif
 !endif
 
-!ifndef OPENJDK
-!if exist($(WorkSpace)\src\closed)
-OPENJDK=false
-!else
-OPENJDK=true
-!endif
+# if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
+!ifndef OPENJDK
+!if !exists($(WorkSpace)\src\closed)
+OPENJDK=true
+!endif
 !endif