Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/windows/projectfiles/common/Makefile	Mon Nov 26 15:11:55 2012 +0100
     1.2 +++ b/make/windows/projectfiles/common/Makefile	Thu Dec 06 14:33:52 2012 +0100
     1.3 @@ -71,41 +71,36 @@
     1.4  
     1.5  !include $(HOTSPOTWORKSPACE)/make/hotspot_version
     1.6  
     1.7 +!if "$(USER_RELEASE_SUFFIX)" != ""
     1.8 +HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)
     1.9 +!else
    1.10 +HOTSPOT_BUILD_VERSION = internal
    1.11 +!endif
    1.12  !if "$(HOTSPOT_RELEASE_VERSION)" != ""
    1.13 -HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)"
    1.14 +HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
    1.15  !else
    1.16 -HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
    1.17 -!endif
    1.18 -!if "$(USER_RELEASE_SUFFIX)" != ""
    1.19 -HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
    1.20 -!else
    1.21 -HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
    1.22 -!endif
    1.23 -!if "$(HOTSPOT_BUILD_VERSION)" != ""
    1.24 -HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
    1.25 +HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\""
    1.26  !endif
    1.27  !if "$(JRE_RELEASE_VERSION)" != ""
    1.28 -JRE_RELEASE_VERSION="$(JRE_RELEASE_VERSION)"
    1.29 +JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
    1.30  !else
    1.31 -JRE_RELEASE_VERSION="$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)"
    1.32 +JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\""
    1.33  !endif
    1.34  
    1.35  # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set,
    1.36  # and if it is not see if we have the src/closed directory
    1.37  !if "$(HOTSPOT_VM_DISTRO)" != ""
    1.38 -HOTSPOT_VM_DISTRO="$(HOTSPOT_VM_DISTRO)"
    1.39 +HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
    1.40  !else
    1.41  !if exists($(HOTSPOTWORKSPACE)\src\closed)
    1.42 -HOTSPOT_VM_DISTRO="Java HotSpot(TM)"
    1.43 +HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
    1.44  !else
    1.45 -HOTSPOT_VM_DISTRO="OpenJDK"
    1.46 +HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
    1.47  !endif
    1.48  !endif
    1.49  
    1.50 -ProjectCreatorIDEOptions =       $(ProjectCreatorIDEOptions) \
    1.51 -      -define              HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
    1.52 -      -define              JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
    1.53 -      -define              HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
    1.54 +ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)
    1.55 +ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
    1.56  
    1.57  $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
    1.58  	@$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)