changeset 739:d9d4dc020cb3

Merge
author cgruszka
date Tue, 02 Apr 2013 13:11:15 -0400
parents ca5bfe0a4ecc 4cfd1375f85f
children b4b7795ef804
files
diffstat 3 files changed, 36 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Mar 27 16:18:01 2013 -0700
+++ b/Makefile	Tue Apr 02 13:11:15 2013 -0400
@@ -164,16 +164,23 @@
   clobber:: deploy-clobber
 endif
 
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+  generic_build_repo_series:: install-binaries-jdk-debug
+  clobber:: install-binaries-jdk-debug-clobber
+endif
+
 generic_build_repo_series::
 	@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
 
 # 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.
+#
+#  Note that debug builds do NOT do INSTALL steps aside from the
+#  install-binaries-jdk-debug or install-binaries-jdk-debug-clobber targets.
 #
 #   DEBUG_NAME is fastdebug or debug
 #   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
 #   The resulting image directory (j2sdk-image) is used by the install makefiles
+#     (only if debug files are present when install checks for them)
 #     to create a debug install bundle jdk-*-debug-** bundle (tar or zip) 
 #     which will install in the debug or fastdebug subdirectory of the
 #     normal product install area.
@@ -189,7 +196,7 @@
 ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
 FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
 FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-  
+
 create_fresh_product_bootdir: FRC
 	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
 		GENERATE_DOCS=false \
@@ -218,7 +225,7 @@
 
 
 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
@@ -256,6 +263,8 @@
 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
 	        DEBUG_NAME=$(DEBUG_NAME) \
 		GENERATE_DOCS=false \
+		BUILD_INSTALL_BUNDLES=true \
+		CREATE_DEBUGINFO_BUNDLES=false \
 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
 		generic_build_repo_series
 
@@ -540,8 +549,8 @@
 ################################################################
 
 .PHONY: all  test test_run test_start test_summary test_clean \
-	generic_build_repo_series \
-	what clobber insane \
+        generic_build_repo_series \
+        what clobber insane \
         dev dev-build dev-sanity dev-clobber \
         product_build \
         fastdebug_build \
@@ -556,4 +565,3 @@
 
 # Force target
 FRC:
-
--- a/make/install-rules.gmk	Wed Mar 27 16:18:01 2013 -0700
+++ b/make/install-rules.gmk	Tue Apr 02 13:11:15 2013 -0400
@@ -97,6 +97,23 @@
 	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
 
+
+install-binaries-jdk-debug:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+	@$(call MakeStart,install,binaries-jdk-debug)
+	($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+	  $(MAKE) binaries-jdk-debug $(INSTALL_BUILD_ARGUMENTS))
+	@$(call MakeFinish,install,binaries-jdk-debug)
+endif
+
+install-binaries-jdk-debug-clobber:
+ifeq ($(BUILD_INSTALL_BUNDLES), true)
+	@$(call MakeStart,install,binaries-jdk-debug-clobber)
+	($(CD) $(INSTALL_TOPDIR)/make/installer/binaries/$(PLATFORM) && \
+	  $(MAKE) binaries-jdk-debug-clobber $(INSTALL_BUILD_ARGUMENTS))
+	@$(call MakeFinish,install,binaries-jdk-debug-clobber)
+endif
+
 install-clobber:
 ifeq ($(BUILD_INSTALL), true)
 	@$(call MakeStart,install,clobber)
@@ -116,4 +133,5 @@
 ######################################
 
 .PHONY: install install-build install-clobber install-sanity \
-	update-installer update-patchgen installer
+	update-installer update-patchgen installer \
+        install-binaries-jdk-debug install-binaries-jdk-debug-clobber
--- a/make/jprt.gmk	Wed Mar 27 16:18:01 2013 -0700
+++ b/make/jprt.gmk	Tue Apr 02 13:11:15 2013 -0400
@@ -30,11 +30,9 @@
 # To get all the bundles from JPRT, use:
 #   jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
 
-DEFAULT_BUILD_FLAVOR=product
-
 # JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
+JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
+JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-install-bundle.zip
 
 ifeq ($(PLATFORM),windows)
   ZIPFLAGS=-q