hotspot/make/aix/makefiles/buildtree.make

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. 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

@@ -35,13 +35,12 @@
 # BUILDARCH     - build directory
 # LIBARCH       - the corresponding directory in JDK/JRE
 # GAMMADIR      - top of workspace
 # OS_FAMILY     - operating system
 # VARIANT       - core, compiler1, compiler2, or tiered
-# HOTSPOT_RELEASE_VERSION - <major_ver>.<minor_ver>.<micro_ver>[-<identifier>][-<debug_target>][-b<nn>]
-# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
-# JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
+# VERSION_STRING - the JDK version string as specified by JEP-223
+# HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build
 #
 # Builds the directory trees with makefiles plus some convenience files in
 # each directory:
 #
 # Makefile      - for "make foo"

@@ -130,15 +129,11 @@
 BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
         SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
 
 # Define variables to be set in flags.make.
 # Default values are set in make/defs.make.
-ifeq ($(HOTSPOT_BUILD_VERSION),)
-  HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)
-else
-  HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)
-endif
+
 # Set BUILD_USER from system-dependent hints:  $LOGNAME, $(whoami)
 ifndef HOTSPOT_BUILD_USER
   HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME)
 endif
 ifndef HOTSPOT_BUILD_USER

@@ -159,11 +154,11 @@
   ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
     OPENJDK=true
   endif
 endif
 
-BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION=  JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING)
 
 BUILDTREE       = \
         $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
 
 BUILDTREE_COMMENT       = echo "\# Generated by $(BUILDTREE_MAKE)"

@@ -208,13 +203,13 @@
         echo "SYSDEFS = \$$(Platform_sysdefs)"; \
         echo "SRCARCH = $(SRCARCH)"; \
         echo "BUILDARCH = $(BUILDARCH)"; \
         echo "LIBARCH = $(LIBARCH)"; \
         echo "TARGET = $(TARGET)"; \
-        echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \
-        echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
-        echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
+        echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \
+        echo "VERSION_STRING = $(VERSION_STRING)"; \
+        echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \
         echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
         echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
         echo "OPENJDK = $(OPENJDK)"; \
         echo "$(LP64_SETTING/$(DATA_MODE))"; \
         echo; \