Mercurial > hg > openjdk > jigsaw
changeset 634:c3bf62746a80
8006797: build-infra JPRT builds need JPRT_ARCHIVE_INSTALL_BUNDLE in common/makefiles/Jprt.gmk
Reviewed-by: ohair
| author | tbell |
|---|---|
| date | Wed, 23 Jan 2013 13:30:11 -0800 |
| parents | edad83acbd46 |
| children | b43aa5bd8ca5 |
| files | common/makefiles/Jprt.gmk |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/common/makefiles/Jprt.gmk Fri Jan 18 16:48:25 2013 +0100 +++ b/common/makefiles/Jprt.gmk Wed Jan 23 13:30:11 2013 -0800 @@ -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)