29 ifneq ($(CYGPATH), ) 30 # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive 31 # style paths 32 ifdef JPRT_ARCHIVE_BUNDLE 33 override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE)) 34 endif 35 ifdef JPRT_ARCHIVE_INSTALL_BUNDLE 36 override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) 37 endif 38 endif 39 40 # When running in JPRT these will be provided. Need defaults so that this makefile 41 # is valid anyway. 42 ifndef JPRT_ARCHIVE_BUNDLE 43 JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 44 endif 45 ifndef JPRT_ARCHIVE_INSTALL_BUNDLE 46 JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip 47 endif 48 49 # This target must be called in the context of a SPEC file 50 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) 51 @$(call CheckIfMakeAtEnd) 52 53 # This target must be called in the context of a SPEC file 54 $(JPRT_ARCHIVE_BUNDLE): bundles 55 $(MKDIR) -p $(@D) 56 $(RM) $@ 57 $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 58 59 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 60 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 61 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 62 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 63 64 # Bundle up the images 65 bundles: all bundles-only 66 bundles-only: start-make 67 @$(call TargetEnter) 68 $(MKDIR) -p $(BUILD_OUTPUT)/bundles | 29 ifneq ($(CYGPATH), ) 30 # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive 31 # style paths 32 ifdef JPRT_ARCHIVE_BUNDLE 33 override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE)) 34 endif 35 ifdef JPRT_ARCHIVE_INSTALL_BUNDLE 36 override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) 37 endif 38 endif 39 40 # When running in JPRT these will be provided. Need defaults so that this makefile 41 # is valid anyway. 42 ifndef JPRT_ARCHIVE_BUNDLE 43 JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 44 endif 45 ifndef JPRT_ARCHIVE_INSTALL_BUNDLE 46 JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip 47 endif 48 49 ifeq ($(SKIP_BOOT_CYCLE), false) 50 jprt_bundle: bootcycle-images 51 endif 52 53 # This target must be called in the context of a SPEC file 54 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) 55 @$(call CheckIfMakeAtEnd) 56 57 # This target must be called in the context of a SPEC file 58 $(JPRT_ARCHIVE_BUNDLE): bundles 59 $(MKDIR) -p $(@D) 60 $(RM) $@ 61 $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 62 63 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 64 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 65 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 66 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 67 68 # Bundle up the images 69 bundles: all bundles-only 70 bundles-only: start-make 71 @$(call TargetEnter) 72 $(MKDIR) -p $(BUILD_OUTPUT)/bundles |