make/MacBundles.gmk
changeset 47334 09d386ddaa42
parent 47253 92fd0e04e0e1
child 48327 d2a837cf9ff1
equal deleted inserted replaced
47333:0c2e5ef6a1c6 47334:09d386ddaa42
    47     BUNDLE_VENDOR := UNDEFINED
    47     BUNDLE_VENDOR := UNDEFINED
    48   else
    48   else
    49     BUNDLE_VENDOR := $(COMPANY_NAME)
    49     BUNDLE_VENDOR := $(COMPANY_NAME)
    50   endif
    50   endif
    51 
    51 
    52   JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
    52   $(eval $(call SetupCopyFiles, COPY_JDK_IMAGE, \
    53   JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
    53       SRC := $(JDK_IMAGE_DIR), \
       
    54       DEST := $(JDK_MACOSX_CONTENTS_DIR)/Home, \
       
    55       FILES := $(call CacheFind, $(JDK_IMAGE_DIR)), \
       
    56   ))
    54 
    57 
    55   JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_MACOSX_CONTENTS_DIR)/Home/,$(JDK_FILE_LIST))
    58   $(eval $(call SetupCopyFiles, COPY_JRE_IMAGE, \
    56   JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_MACOSX_CONTENTS_DIR)/Home/,$(JRE_FILE_LIST))
    59       SRC := $(JRE_IMAGE_DIR), \
    57 
    60       DEST := $(JRE_MACOSX_CONTENTS_DIR)/Home, \
    58   # Copy empty directories (jre/lib/applet).
    61       FILES := $(call CacheFind, $(JRE_IMAGE_DIR)), \
    59   $(JDK_MACOSX_CONTENTS_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
    62   ))
    60 	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
       
    61 	$(MKDIR) -p $(@D)
       
    62 	if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
       
    63 
       
    64   $(JRE_MACOSX_CONTENTS_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
       
    65 	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
       
    66 	$(MKDIR) -p $(@D)
       
    67 	if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
       
    68 
    63 
    69   $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
    64   $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
    70 	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
    65 	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
    71 	$(MKDIR) -p $(@D)
    66 	$(MKDIR) -p $(@D)
    72 	$(RM) $@
    67 	$(RM) $@
   100           @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
    95           @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
   101           @@VERSION@@ => $(BUNDLE_VERSION) ; \
    96           @@VERSION@@ => $(BUNDLE_VERSION) ; \
   102           @@VENDOR@@ => $(BUNDLE_VENDOR) , \
    97           @@VENDOR@@ => $(BUNDLE_VENDOR) , \
   103   ))
    98   ))
   104 
    99 
   105   jdk-bundle: $(JDK_TARGET_LIST) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
   100   jdk-bundle: $(COPY_JDK_IMAGE) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
   106       $(BUILD_JDK_PLIST)
   101       $(BUILD_JDK_PLIST)
   107 	$(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
   102 	$(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
   108 
   103 
   109   jre-bundle: $(JRE_TARGET_LIST) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
   104   jre-bundle: $(COPY_JRE_IMAGE) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
   110       $(BUILD_JRE_PLIST)
   105       $(BUILD_JRE_PLIST)
   111 	$(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
   106 	$(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
   112 
   107 
   113 else # Not macosx
   108 else # Not macosx
   114 
   109