hotspot/make/windows/projectfiles/common/Makefile

*** 1,7 ****
  #
! # Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 78,96 ****
  
  default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles)
  
  !include $(HOTSPOTWORKSPACE)/make/jdk_version
  
! !if "$(USER_RELEASE_SUFFIX)" != ""
! HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX)
  !else
  HOTSPOT_BUILD_VERSION = internal
  !endif
! !if "$(JRE_RELEASE_VERSION)" != ""
! JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\""
  !else
! JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\""
  !endif
  !if "$(HOTSPOT_RELEASE_VERSION)" != ""
  HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
  !else
  HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
--- 78,96 ----
  
  default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles)
  
  !include $(HOTSPOTWORKSPACE)/make/jdk_version
  
! !if "$(VERSION_OPT)" != ""
! HOTSPOT_BUILD_VERSION = internal-$(VERSION_OPT)
  !else
  HOTSPOT_BUILD_VERSION = internal
  !endif
! !if "$(VERSION_STRING)" != ""
! JRE_RELEASE_VERSION="\\\"$(VERSION_STRING)\\\""
  !else
! JRE_RELEASE_VERSION="\\\"$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER)\\\""
  !endif
  !if "$(HOTSPOT_RELEASE_VERSION)" != ""
  HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
  !else
  HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
*** 103,124 ****
  !if exists($(HOTSPOTWORKSPACE)\src\closed)
  HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
  !else
  HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
  !endif
! !if "$(JDK_BUILD_NUMBER)" != ""
! JDK_BUILD_NUMBER="\\\"$(JDK_BUILD_NUMBER)\\\""
! !else
! JDK_BUILD_NUMBER="\\\"00\\\""
  !endif
  !endif
  
! JDK_MAJOR_VERSION="\\\"$(JDK_MAJOR_VER)\\\""
! JDK_MINOR_VERSION="\\\"$(JDK_MINOR_VER)\\\""
! JDK_MICRO_VERSION="\\\"$(JDK_MICRO_VER)\\\""
  
! ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) -define JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) -define JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) -define JDK_BUILD_NUMBER=$(JDK_BUILD_NUMBER) -define VISUAL_STUDIO_BUILD=true
  ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
  
  $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
          @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
  
--- 103,123 ----
  !if exists($(HOTSPOTWORKSPACE)\src\closed)
  HOTSPOT_VM_DISTRO="\\\"Java HotSpot(TM)\\\""
  !else
  HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
  !endif
! !if "$(VERSION_BUILD)" == ""
! VERSION_BUILD=0
  !endif
  !endif
  
! VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
! VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
! VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
! VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
  
! ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define VERSION_MAJOR=$(VERSION_MAJOR) -define VERSION_MINOR=$(VERSION_MINOR) -define VERSION_SECURITY=$(VERSION_SECURITY) -define VERSION_PATCH=$(VERSION_PATCH) -define VISUAL_STUDIO_BUILD=true
  ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
  
  $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
          @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)