Mercurial > hg > openjdk > jdk8
changeset 601:9e5847257731
Merge
| author | erikj |
|---|---|
| date | Thu, 24 Jan 2013 09:17:26 +0100 |
| parents | 0d46733cfffb (current diff) b43aa5bd8ca5 (diff) |
| children | 2a713921952c |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/common/makefiles/Jprt.gmk Wed Jan 23 11:42:29 2013 +0100 +++ b/common/makefiles/Jprt.gmk Thu Jan 24 09:17:26 2013 +0100 @@ -150,6 +150,9 @@ ifndef JPRT_ARCHIVE_BUNDLE JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip endif +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE + JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip +endif # These targets execute in a SPEC free context, before calling bridgeBuild # to generate the SPEC. @@ -188,6 +191,9 @@ else $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . + if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ + fi endif @$(call TargetExit)
--- a/make/install-rules.gmk Wed Jan 23 11:42:29 2013 +0100 +++ b/make/install-rules.gmk Thu Jan 24 09:17:26 2013 +0100 @@ -96,6 +96,9 @@ combo_build: @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all install-clobber: ifeq ($(BUILD_INSTALL), true)