Mercurial > hg > openjdk > jigsaw
changeset 623:6e822b534678
8006100: build-infra: Bundle up the correct images in jprt
Reviewed-by: tbell
| author | erikj |
|---|---|
| date | Mon, 14 Jan 2013 15:30:22 +0100 |
| parents | 3540aa40c868 |
| children | 52cce3326649 |
| files | NewMakefile.gmk common/makefiles/Jprt.gmk |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/NewMakefile.gmk Mon Jan 14 13:09:59 2013 +0100 +++ b/NewMakefile.gmk Mon Jan 14 15:30:22 2013 +0100 @@ -50,8 +50,6 @@ endif root_dir:=$(dir $(makefile_path)) -include $(root_dir)/common/makefiles/Jprt.gmk - # ... and then we can include our helper functions include $(root_dir)/common/makefiles/MakeHelpers.gmk @@ -80,6 +78,10 @@ endif endif +# Include this after a potential spec file has been included so that the bundles target +# has access to the spec variables. +include $(root_dir)/common/makefiles/Jprt.gmk + # Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. # If you addd more global targets, please update the variable global_targets in MakeHelpers.
--- a/common/makefiles/Jprt.gmk Mon Jan 14 13:09:59 2013 +0100 +++ b/common/makefiles/Jprt.gmk Mon Jan 14 15:30:22 2013 +0100 @@ -26,7 +26,8 @@ # This file is included by the root NewerMakefile and contains targets # and utilities needed by JPRT. -# Utilities used in this Makefile +# Utilities used in this Makefile. Most of this makefile executes without +# the context of a spec file from configure. CAT=cat CMP=cmp CP=cp @@ -177,8 +178,13 @@ bundles: all @$(call TargetEnter) $(MKDIR) -p $(BUILD_OUTPUT)/bundles - $(CD) $(IMAGES_OUTPUTDIR)/j2sdk-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . - $(CD) $(IMAGES_OUTPUTDIR)/j2re-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) + $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . + $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . +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 . +endif @$(call TargetExit) # Keep track of phony targets