Mercurial > hg > openjdk > jigsaw
changeset 163:87cdb4678278 jigsaw-b02
SKIP_BOOT_CYCLE=false to use jdk-module-image for modules build
Summary: zip up jdk-module-image for modules build
Reviewed-by: ohair
| author | mchung |
|---|---|
| date | Fri, 02 Apr 2010 23:04:36 -0700 |
| parents | 00c40d39181b |
| children | bef3965ce4a8 |
| files | Makefile make/jprt.gmk |
| diffstat | 2 files changed, 30 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Mar 05 12:16:55 2010 -0800 +++ b/Makefile Fri Apr 02 23:04:36 2010 -0700 @@ -120,10 +120,16 @@ all_product_build:: @$(FINISH_ECHO) -# Generis build of basic repo series +# The resulting full jdk image (legacy or module image) +JDK_IMAGE_NAME=j2sdk-image +ifdef BUILD_MODULES + JDK_IMAGE_NAME=jdk-module-image +endif + +# Generic build of basic repo series generic_build_repo_series:: $(MKDIR) -p $(OUTPUTDIR) - $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image + $(MKDIR) -p $(OUTPUTDIR)/$(JDK_IMAGE_NAME) ifeq ($(BUILD_LANGTOOLS), true) generic_build_repo_series:: langtools @@ -182,8 +188,8 @@ # Location of fresh bootdir output ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk -FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image -FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image +FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_NAME) +FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/$(JDK_IMAGE_NAME) create_fresh_product_bootdir: FRC @$(START_ECHO) @@ -302,7 +308,7 @@ OPENJDK_BUILD_NAME \ = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE) OPENJDK_BUILD_BINARY_ZIP=$(ABS_BIN_BUNDLEDIR)/$(OPENJDK_BUILD_NAME).zip -BUILT_IMAGE=$(ABS_OUTPUTDIR)/j2sdk-image +BUILT_IMAGE=$(ABS_OUTPUTDIR)/$(JDK_IMAGE_NAME) ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) OPENJDK_BOOTDIR=$(BOOTDIR) OPENJDK_IMPORTJDK=$(JDK_IMPORT_PATH) @@ -331,7 +337,7 @@ ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \ product_build ) $(RM) $(OPENJDK_BUILD_BINARY_ZIP) - ( $(CD) $(OPENJDK_OUTPUTDIR)/j2sdk-image && \ + ( $(CD) $(OPENJDK_OUTPUTDIR)/$(JDK_IMAGE_NAME) && \ $(ZIPEXE) -q -r $(OPENJDK_BUILD_BINARY_ZIP) .) $(RM) -r $(OPENJDK_OUTPUTDIR) @$(ECHO) " "
--- a/make/jprt.gmk Fri Mar 05 12:16:55 2010 -0800 +++ b/make/jprt.gmk Fri Apr 02 23:04:36 2010 -0700 @@ -58,12 +58,28 @@ jprt_build_fastdebug: fastdebug_build - ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)-fastdebug/$(JPRT_ARCHIVE_IMAGE) && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) +ifdef HAVE_JPRT_SAVE_BUNDLES + ( $(CD) $(OUTPUTDIR)-fastdebug/bundles && \ + $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) +endif +ifdef BUILD_MODULES + ( $(CD) $(OUTPUTDIR)-fastdebug && \ + $(ZIPEXE) -q -r $(JPRT_ARCHIVE_MODULES_BUNDLE) jre-base-image jigsaw-pkgs) +endif jprt_build_debug: debug_build - ( $(CD) $(OUTPUTDIR)-debug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)-debug/$(JPRT_ARCHIVE_IMAGE) && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) +ifdef HAVE_JPRT_SAVE_BUNDLES + ( $(CD) $(OUTPUTDIR)-debug/bundles && \ + $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ) +endif +ifdef BUILD_MODULES + ( $(CD) $(OUTPUTDIR)-debug && \ + $(ZIPEXE) -q -r $(JPRT_ARCHIVE_MODULES_BUNDLE) jre-base-image jigsaw-pkgs) +endif ################################################################ # PHONY