makefiles/Bundles.gmk

Print this page

        

*** 31,43 **** # Only macosx has bundles defined. ifeq ($(OPENJDK_TARGET_OS), macosx) bundles: jre-bundle jdk-bundle ! ! JDK_BUNDLE_DIR := $(IMAGES_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents ! JRE_BUNDLE_DIR := $(IMAGES_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents MACOSX_SRC := $(JDK_TOPDIR)/src/macosx # All these OPENJDK checks are needed since there is no coherency between # these values in open and closed. Should probably be fixed. --- 31,41 ---- # Only macosx has bundles defined. ifeq ($(OPENJDK_TARGET_OS), macosx) bundles: jre-bundle jdk-bundle ! # JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC. MACOSX_SRC := $(JDK_TOPDIR)/src/macosx # All these OPENJDK checks are needed since there is no coherency between # these values in open and closed. Should probably be fixed.
*** 68,92 **** else BUNDLE_VENDOR := $(COMPANY_NAME) endif ! JDK_FILE_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/j2sdk-image ! -type d) ! JRE_FILE_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/j2re-image ! -type d) ! JDK_TARGET_LIST := $(subst $(IMAGES_OUTPUTDIR)/j2sdk-image,$(JDK_BUNDLE_DIR)/Home,$(JDK_FILE_LIST)) ! JRE_TARGET_LIST := $(subst $(IMAGES_OUTPUTDIR)/j2re-image,$(JRE_BUNDLE_DIR)/Home,$(JRE_FILE_LIST)) # The old builds implementation of this did not preserve symlinks so # make sure they are followed and the contents copied instead. # To fix this, just replace copy with install-file macro. ! $(JDK_BUNDLE_DIR)/Home/%: $(IMAGES_OUTPUTDIR)/j2sdk-image/% $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(CP) -f -R -L '$<' '$@' ! $(JRE_BUNDLE_DIR)/Home/%: $(IMAGES_OUTPUTDIR)/j2re-image/% $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(CP) -f -R -L '$<' '$@' $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib: --- 66,90 ---- else BUNDLE_VENDOR := $(COMPANY_NAME) endif ! JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR) ! -type d) ! JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR) ! -type d) ! JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR),$(JDK_BUNDLE_DIR)/Home,$(JDK_FILE_LIST)) ! JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR),$(JRE_BUNDLE_DIR)/Home,$(JRE_FILE_LIST)) # The old builds implementation of this did not preserve symlinks so # make sure they are followed and the contents copied instead. # To fix this, just replace copy with install-file macro. ! $(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/% $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(CP) -f -R -L '$<' '$@' ! $(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/% $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) $(CP) -f -R -L '$<' '$@' $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib: