hotspot/make/Makefile

*** 1,7 ****
  #
! # Copyright (c) 2005, 2013, 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) 2005, 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.
*** 46,66 ****
  #  ALT_JDK_TARGET_IMPORT_PATH Current JDK build when cross-compiling
  #  ALT_BUILD_WIN_SA           Building SA on Windows is disabled by default.
  #                             Set ALT_BUILD_WIN_SA=1 to enable building SA on
  #                             Windows.
  # Version strings and numbers:
! #  JDK_VERSION                Current JDK version (e.g. 1.6.0)
! #  PREVIOUS_JDK_VERSION       Previous (bootdir) JDK version (e.g. 1.5.0)
! #  FULL_VERSION               Full version string to use (e.g. "1.6.0-ea-b42")
! #
! # Version strings and numbers especially needed on Windows:
! #  COOKED_JDK_UPDATE_VERSION  Just the update release number (e.g. 02)
! #  COOKED_BUILD_NUMBER        Just the build number (e.g. 42)
! #  JDK_MKTG_VERSION           Marketing JDK version (e.g. 6.0)
! #  JDK_MAJOR_VERSION          Major number for version (e.g. 1) always 1?
! #  JDK_MINOR_VERSION          Minor number for version (e.g. 6)
! #  JDK_MICRO_VERSION          Micro number for version (e.g. 0)
  #
  
  # Default is build both product fastdebug and create export area
  
  # Allow to build HotSpot in local directory from sources specified by GAMMADIR.
--- 46,62 ----
  #  ALT_JDK_TARGET_IMPORT_PATH Current JDK build when cross-compiling
  #  ALT_BUILD_WIN_SA           Building SA on Windows is disabled by default.
  #                             Set ALT_BUILD_WIN_SA=1 to enable building SA on
  #                             Windows.
  # Version strings and numbers:
! #  VERSION_SHORT      Current JDK version (e.g. 9.0.0)
! #  JDK_PREVIOUS_VERSION Previous (bootdir) JDK version (e.g. 1.5.0) (Only needed
! #  to facilitate standalone build.)
! #  VERSION_STRING     Full version string to use (e.g. "9.0.0-ea-b42")
! #  VERSION_MAJOR Major number for version (e.g. 9)
! #  VERSION_MINOR Minor number for version (e.g. 0)
! #  VERSION_SECURITY Security number for version (e.g. 0)
  #
  
  # Default is build both product fastdebug and create export area
  
  # Allow to build HotSpot in local directory from sources specified by GAMMADIR.
*** 851,863 ****
          @$(ECHO) \
  "  $(MAKE) all"
          @$(ECHO) \
  "  $(MAKE) world"
          @$(ECHO) \
! "  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
          @$(ECHO) \
! "  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
  
  # Universal build support
  ifeq ($(OS_VENDOR), Darwin)
  ifeq ($(MACOSX_UNIVERSAL),true)
  include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
--- 847,859 ----
          @$(ECHO) \
  "  $(MAKE) all"
          @$(ECHO) \
  "  $(MAKE) world"
          @$(ECHO) \
! "  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(JDK_PREVIOUS_VERSION)"
          @$(ECHO) \
! "  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(VERSION_STRING)"
  
  # Universal build support
  ifeq ($(OS_VENDOR), Darwin)
  ifeq ($(MACOSX_UNIVERSAL),true)
  include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk