Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/Jprt.gmk	Wed Jan 23 11:42:29 2013 +0100
     1.2 +++ b/common/makefiles/Jprt.gmk	Thu Jan 24 09:17:26 2013 +0100
     1.3 @@ -150,6 +150,9 @@
     1.4  ifndef JPRT_ARCHIVE_BUNDLE
     1.5    JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
     1.6  endif
     1.7 +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
     1.8 +    JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
     1.9 +endif
    1.10  
    1.11  # These targets execute in a SPEC free context, before calling bridgeBuild
    1.12  # to generate the SPEC.
    1.13 @@ -188,6 +191,9 @@
    1.14  else
    1.15  	$(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
    1.16  	$(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
    1.17 +	if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
    1.18 +           $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
    1.19 +        fi
    1.20  endif
    1.21  	@$(call TargetExit)
    1.22  

     2.1 --- a/make/install-rules.gmk	Wed Jan 23 11:42:29 2013 +0100
     2.2 +++ b/make/install-rules.gmk	Thu Jan 24 09:17:26 2013 +0100
     2.3 @@ -96,6 +96,9 @@
     2.4  combo_build:
     2.5  	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
     2.6  	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
     2.7 +	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all
     2.8 +	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
     2.9 +	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all
    2.10  
    2.11  install-clobber:
    2.12  ifeq ($(BUILD_INSTALL), true)