diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index ce58a609d1bd62461bc8b1aad971bc6e48a8f37f..68910f187245332da24576870e927f6c7d563f32 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -6,3 +6,4 @@ cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31
+64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
diff --git a/Makefile b/Makefile
index 24cd12282e27098d32d6831a097a73101a5197a1..4181e29b9c4a45ea612ca42ec9afda67e0a3d5ad 100644
--- a/Makefile
+++ b/Makefile
@@ -49,27 +49,17 @@ ifndef JDK_MAKE_SHARED_DIR
JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
endif
-include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
-
-include ./make/Defs-internal.gmk
+# For start and finish echo lines
+TITLE_TEXT = Control $(PLATFORM) $(ARCH) $(RELEASE)
+DAYE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'`
+START_ECHO = echo "$(TITLE_TEXT) $@ build started: $(DATE_STAMP)"
+FINISH_ECHO = echo "$(TITLE_TEXT) $@ build finished: $(DATE_STAMP)"
-all::
- @$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: `$(DATE) '+%y-%m-%d %H:%M'`
- $(MKDIR) -p $(OUTPUTDIR)
+default: all
-# Rules for sanity checks
+include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
+include ./make/Defs-internal.gmk
include ./make/sanity-rules.gmk
-
-dev : dev-build
-
-dev-build:
- $(MAKE) DEV_ONLY=true all
-dev-sanity:
- $(MAKE) DEV_ONLY=true sanity
-dev-clobber:
- $(MAKE) DEV_ONLY=true clobber
-
-# Rules for various components
include ./make/hotspot-rules.gmk
include ./make/langtools-rules.gmk
include ./make/corba-rules.gmk
@@ -80,68 +70,101 @@ include ./make/install-rules.gmk
include ./make/sponsors-rules.gmk
include ./make/deploy-rules.gmk
-all:: setup build
+# What "all" means
+all::
+ @$(START_ECHO)
-setup: openjdk_check
- $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
+all:: openjdk_check sanity all_product_build
+
+ifeq ($(SKIP_FASTDEBUG_BUILD), false)
+ all:: fastdebug_build
+endif
+
+ifeq ($(SKIP_DEBUG_BUILD), false)
+ all:: debug_build
+endif
-# Check on whether we really can build the openjdk, need source etc.
-openjdk_check: FRC
ifneq ($(SKIP_OPENJDK_BUILD), true)
- @$(ECHO) " "
- @$(ECHO) "================================================="
- @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \
- $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \
- exit 1; \
- else \
- $(ECHO) "OpenJDK will be built after JDK is built"; \
- $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \
- fi
- @$(ECHO) "================================================="
- @$(ECHO) " "
+ all:: openjdk_build
endif
-build:: sanity
+all::
+ @$(FINISH_ECHO)
+
+# Everything for a full product build
+all_product_build::
+ @$(START_ECHO)
-clobber::
+ifeq ($(SKIP_PRODUCT_BUILD), false)
+
+ all_product_build:: product_build
+
+ ifeq ($(BUILD_INSTALL), true)
+ all_product_build:: $(INSTALL)
+ clobber:: install-clobber
+ endif
+
+ ifeq ($(BUILD_SPONSORS), true)
+ all_product_build:: $(SPONSORS)
+ clobber:: sponsors-clobber
+ endif
+
+ ifneq ($(SKIP_COMPARE_IMAGES), true)
+ all_product_build:: compare-image
+ endif
+
+endif
+
+all_product_build::
+ @$(FINISH_ECHO)
+
+# Generis build of basic repo series
+generic_build_repo_series::
+ $(MKDIR) -p $(OUTPUTDIR)
+ $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
ifeq ($(BUILD_LANGTOOLS), true)
- build:: langtools
+ generic_build_repo_series:: langtools
clobber:: langtools-clobber
endif
ifeq ($(BUILD_CORBA), true)
- build:: corba
+ generic_build_repo_series:: corba
clobber:: corba-clobber
endif
ifeq ($(BUILD_JAXP), true)
- build:: jaxp
+ generic_build_repo_series:: jaxp
clobber:: jaxp-clobber
endif
ifeq ($(BUILD_JAXWS), true)
- build:: jaxws
+ generic_build_repo_series:: jaxws
clobber:: jaxws-clobber
endif
ifeq ($(BUILD_HOTSPOT), true)
- build:: $(HOTSPOT)
+ generic_build_repo_series:: $(HOTSPOT)
clobber:: hotspot-clobber
endif
ifeq ($(BUILD_JDK), true)
- build:: $(JDK_JAVA_EXE)
+ generic_build_repo_series:: $(JDK_JAVA_EXE)
clobber:: jdk-clobber
endif
ifeq ($(BUILD_DEPLOY), true)
- build:: $(DEPLOY)
+ generic_build_repo_series:: $(DEPLOY)
clobber:: deploy-clobber
endif
-#
-# Generic debug build, fastdebug or debug. Needs special handling.
+ifeq ($(BUILD_JDK), true)
+ ifeq ($(BUNDLE_RULES_AVAILABLE), true)
+ generic_build_repo_series:: openjdk-binary-plugs-bundles
+ endif
+endif
+
+# The debug build, fastdebug or debug. Needs special handling.
# Note that debug builds do NOT do INSTALL steps, but must be done
# after the product build and before the INSTALL step of the product build.
#
@@ -155,57 +178,109 @@ endif
# look for INSTALL_DEBUG_NAME in the install rules.
#
-COMMON_DEBUG_FLAGS= \
- DEBUG_NAME=$(DEBUG_NAME) \
- ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \
- NO_DOCS=true
-
-product_build: setup
- @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
- $(MAKE) SKIP_FASTDEBUG_BUILD=true SKIP_DEBUG_BUILD=true all
- @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'`
-
-generic_debug_build:
- @$(ECHO) $@ build started: `$(DATE) '+%y-%m-%d %H:%M'`
- $(MAKE) $(COMMON_DEBUG_FLAGS) setup build
- @$(ECHO) $@ build finished: `$(DATE) '+%y-%m-%d %H:%M'`
+# Location of fresh bootdir output
+ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
+FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image
+FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image
+
+create_fresh_product_bootdir: FRC
+ @$(START_ECHO)
+ $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+ NO_DOCS=true \
+ BOOT_CYCLE_SETTINGS= \
+ build_product_image
+ @$(FINISH_ECHO)
+
+create_fresh_debug_bootdir: FRC
+ @$(START_ECHO)
+ $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+ NO_DOCS=true \
+ BOOT_CYCLE_DEBUG_SETTINGS= \
+ build_debug_image
+ @$(FINISH_ECHO)
+
+create_fresh_fastdebug_bootdir: FRC
+ @$(START_ECHO)
+ $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
+ NO_DOCS=true \
+ BOOT_CYCLE_DEBUG_SETTINGS= \
+ build_fastdebug_image
+ @$(FINISH_ECHO)
+
+# Create boot image?
+ifeq ($(SKIP_BOOT_CYCLE),false)
+ ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
+ DO_BOOT_CYCLE=true
+ endif
+endif
-debug_build: setup
- $(MAKE) DEBUG_NAME=debug generic_debug_build
+ifeq ($(DO_BOOT_CYCLE),true)
+
+ # Create the bootdir to use in the build
+ product_build:: create_fresh_product_bootdir
+ debug_build:: create_fresh_debug_bootdir
+ fastdebug_build:: create_fresh_fastdebug_bootdir
+
+ # Define variables to be used now for the boot jdk
+ BOOT_CYCLE_SETTINGS= \
+ ALT_BOOTDIR=$(FRESH_BOOTDIR) \
+ ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR)
+ BOOT_CYCLE_DEBUG_SETTINGS= \
+ ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \
+ ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR)
-fastdebug_build: setup
- $(MAKE) DEBUG_NAME=fastdebug generic_debug_build
+else
-ifeq ($(SKIP_FASTDEBUG_BUILD), false)
- all:: fastdebug_build
-endif
+ # Use the supplied ALT_BOOTDIR as the boot
+ BOOT_CYCLE_SETTINGS=
+ BOOT_CYCLE_DEBUG_SETTINGS=
-ifeq ($(SKIP_DEBUG_BUILD), false)
- all:: debug_build
endif
-ifeq ($(BUILD_JDK), true)
- ifeq ($(BUNDLE_RULES_AVAILABLE), true)
- all:: openjdk-binary-plugs-bundles
- endif
-endif
+build_product_image:
+ @$(START_ECHO)
+ $(MAKE) \
+ SKIP_FASTDEBUG_BUILD=true \
+ SKIP_DEBUG_BUILD=true \
+ $(BOOT_CYCLE_SETTINGS) \
+ generic_build_repo_series
+ @$(FINISH_ECHO)
-ifeq ($(BUILD_INSTALL), true)
- all :: $(INSTALL)
- clobber:: install-clobber
-endif
+generic_debug_build:
+ @$(START_ECHO)
+ $(MAKE) \
+ ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \
+ DEBUG_NAME=$(DEBUG_NAME) \
+ NO_DOCS=true \
+ $(BOOT_CYCLE_DEBUG_SETTINGS) \
+ generic_build_repo_series
+ @$(FINISH_ECHO)
+
+build_debug_image:
+ $(MAKE) DEBUG_NAME=debug generic_debug_build
-ifeq ($(BUILD_SPONSORS), true)
- all :: $(SPONSORS)
- clobber:: sponsors-clobber
-endif
+build_fastdebug_image:
+ $(MAKE) DEBUG_NAME=fastdebug generic_debug_build
-ifneq ($(SKIP_COMPARE_IMAGES), true)
- all :: compare-image
-endif
+# Build final image
+product_build:: build_product_image
+debug_build:: build_debug_image
+fastdebug_build:: build_fastdebug_image
+# Check on whether we really can build the openjdk, need source etc.
+openjdk_check: FRC
ifneq ($(SKIP_OPENJDK_BUILD), true)
- all :: openjdk_build
+ @$(ECHO) " "
+ @$(ECHO) "================================================="
+ @if [ ! -r $(OPENJDK_BUILDDIR)/Makefile ] ; then \
+ $(ECHO) "ERROR: No openjdk source tree available at: $(OPENJDK_BUILDDIR)"; \
+ exit 1; \
+ else \
+ $(ECHO) "OpenJDK will be built after JDK is built"; \
+ $(ECHO) " OPENJDK_BUILDDIR=$(OPENJDK_BUILDDIR)"; \
+ fi
+ @$(ECHO) "================================================="
+ @$(ECHO) " "
endif
# If we have bundle rules, we have a chance here to do a complete cycle
@@ -235,6 +310,7 @@ else
endif
openjdk_build:
+ @$(START_ECHO)
@$(ECHO) " "
@$(ECHO) "================================================="
@$(ECHO) "Starting openjdk build"
@@ -245,6 +321,7 @@ openjdk_build:
$(MKDIR) -p $(OPENJDK_OUTPUTDIR)
($(CD) $(OPENJDK_BUILDDIR) && $(MAKE) \
OPENJDK=true \
+ NO_DOCS=true \
ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
@@ -261,6 +338,7 @@ openjdk_build:
@$(ECHO) " Binary Bundle: $(OPENJDK_BUILD_BINARY_ZIP)"
@$(ECHO) "================================================="
@$(ECHO) " "
+ @$(FINISH_ECHO)
endif
endif
@@ -274,8 +352,18 @@ clobber::
clean: clobber
-all::
- @$(ECHO) Control build finished: `$(DATE) '+%y-%m-%d %H:%M'`
+#
+# Dev builds
+#
+
+dev : dev-build
+
+dev-build:
+ $(MAKE) DEV_ONLY=true all
+dev-sanity:
+ $(MAKE) DEV_ONLY=true sanity
+dev-clobber:
+ $(MAKE) DEV_ONLY=true clobber
#
# Quick jdk verification build
@@ -460,16 +548,6 @@ ifeq ($(BUNDLE_RULES_AVAILABLE), true)
include $(BUNDLE_RULES)
endif
-################################################################
-# Cycle build. Build the jdk, use it to build the jdk again.
-################################################################
-
-ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
-
-boot_cycle:
- $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) product_build
- $(MAKE) ALT_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image product_build
-
################################################################
# JPRT rule to build
################################################################
@@ -480,9 +558,20 @@ include ./make/jprt.gmk
# PHONY
################################################################
-.PHONY: all build what clobber insane \
- fastdebug_build debug_build product_build setup \
- dev dev-build dev-sanity dev-clobber
+.PHONY: all \
+ generic_build_repo_series \
+ what clobber insane \
+ dev dev-build dev-sanity dev-clobber \
+ product_build \
+ fastdebug_build \
+ debug_build \
+ build_product_image \
+ build_debug_image \
+ build_fastdebug_image \
+ create_fresh_product_bootdir \
+ create_fresh_debug_bootdir \
+ create_fresh_fastdebug_bootdir \
+ generic_debug_build
# Force target
FRC:
diff --git a/README-builds.html b/README-builds.html
index 37998f9c1f67b57d58eca7ffa8c87e5f70da9595..d4f008720cff3f8a5bc5867e7c56174e32fcc22c 100644
--- a/README-builds.html
+++ b/README-builds.html
@@ -132,7 +132,7 @@
See
SunSolve for patch downloads.
- | Sun Studio 11 |
+ Sun Studio 12 |
| Solaris SPARCV9 (64bit) |
@@ -141,7 +141,7 @@
See
SunSolve for patch downloads.
- Sun Studio 11 |
+ Sun Studio 12 |
| Solaris X86 (32bit) |
@@ -150,7 +150,7 @@
See
SunSolve for patch downloads.
- Sun Studio 11 |
+ Sun Studio 12 |
| Solaris X64 (64bit) |
@@ -159,7 +159,7 @@
See
SunSolve for patch downloads.
- Sun Studio 11 |
+ Sun Studio 12 |
| Windows X86 (32bit) |
@@ -831,8 +831,8 @@
At a minimum, the
- Sun Studio 11 Compilers
- (containing version 5.8 of the C and C++ compilers) is required,
+ Sun Studio 12 Compilers
+ (containing version 5.9 of the C and C++ compilers) is required,
with patches from the
SunSolve web site.
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index b23c6ac9012fe893e9e344a5ec16da5fcdf4f465..9bcabb24f880ef27f52abbe31af1bc7e7e0b17bd 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -6,3 +6,4 @@ c14dab40ed9bf45ad21150bd70c9c80cdf655415 jdk7-b28
4f91c08b3e4498213a9c5a24898f7d9c38cf86fb jdk7-b29
d1605aabd0a15ecf93787c47de63073c33fba52d jdk7-b30
9c2ecc2ffb125f14fab3857fe7689598956348a0 jdk7-b31
+b727c32788a906c04839516ae7443a085185a300 jdk7-b32
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index bd0ecb7bb5ba16db2a3e27f41fdedc5807546495..aae0ab7367b4aad8b266aba1ae5d6734155fc380 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -159,6 +159,9 @@ else
SKIP_OPENJDK_BUILD = true
endif
endif
+ifndef SKIP_PRODUCT_BUILD
+ SKIP_PRODUCT_BUILD = false
+endif
# Solaris 64 bit builds are not complete enough to ever do this
ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
diff --git a/make/jprt.config b/make/jprt.config
index d9b57f0e8ac6c279edb55ed1e8c922cc7873bfa9..08e56cac149d47e33766426d4ff5dc75e6d00ea7 100644
--- a/make/jprt.config
+++ b/make/jprt.config
@@ -115,13 +115,13 @@ dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH
dirMustExist "${ANT_HOME}" ANT_HOME
dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME
-# If ALT_PREVIOUS_JDK_IMAGE not defined, set it to the bootdir area for
+# If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for
# any possible image comparisons.
# We assume bootdir is a previous jdk release image, valid for comparison
# reasons.
-if [ "${ALT_PREVIOUS_JDK_IMAGE}" = "" ] ; then
- ALT_PREVIOUS_JDK_IMAGE="${bootdir}"
- export ALT_PREVIOUS_JDK_IMAGE
+if [ "${ALT_PREVIOUS_RELEASE_IMAGE}" = "" ] ; then
+ ALT_PREVIOUS_RELEASE_IMAGE="${bootdir}"
+ export ALT_PREVIOUS_RELEASE_IMAGE
fi
# Use the JDK import for now (FIXME: use the binary plugs?)
@@ -146,9 +146,7 @@ if [ "${osname}" = SunOS ] ; then
if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
else
- # FIXUP: Change to SS12 when validated
- #compiler_name=SS12
- compiler_name=SS11
+ compiler_name=SS12
fi
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
ALT_COMPILER_PATH="${compiler_path}"
diff --git a/make/jprt.gmk b/make/jprt.gmk
index 0ecdf7d041b66e42a78473a3530ec9c425c446b4..d1764e114545825b534b4fb8b19127d695743874 100644
--- a/make/jprt.gmk
+++ b/make/jprt.gmk
@@ -36,7 +36,7 @@ DEFAULT_BUILD_FLAVOR=product
JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
-jprt_build_product: product_build
+jprt_build_product: all_product_build
( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
ifdef HAVE_JPRT_SAVE_BUNDLES