OpenJDK / jdk / jdk
changeset 57441:7a1e6bd6a836
8235687: Contents/MacOS/libjli.dylib cannot be a symlink
Reviewed-by: tbell
| author | erikj |
|---|---|
| date | Thu, 12 Dec 2019 19:35:57 +0000 |
| parents | 2c724dba4c3c |
| children | 91a3f092682f |
| files | make/MacBundles.gmk |
| diffstat | 1 files changed, 18 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/make/MacBundles.gmk Thu Dec 12 16:23:13 2019 +0100 +++ b/make/MacBundles.gmk Thu Dec 12 19:35:57 2019 +0000 @@ -61,17 +61,15 @@ FILES := $(call FindFiles, $(JRE_IMAGE_DIR)), \ )) - $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib: - $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(call MakeTargetDir) - $(RM) $@ - $(LN) -s ../Home/lib/libjli.dylib $@ + $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \ + FILES := $(JDK_IMAGE_DIR)/lib/libjli.dylib, \ + DEST := $(JDK_MACOSX_CONTENTS_DIR)/MacOS, \ + )) - $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib: - $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(call MakeTargetDir) - $(RM) $@ - $(LN) -s ../Home/lib/libjli.dylib $@ + $(eval $(call SetupCopyFiles, COPY_LIBJLI_JRE, \ + FILES := $(JRE_IMAGE_DIR)/lib/libjli.dylib, \ + DEST := $(JRE_MACOSX_CONTENTS_DIR)/MacOS, \ + )) $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \ SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \ @@ -97,13 +95,19 @@ @@VENDOR@@ => $(BUNDLE_VENDOR) , \ )) - jdk-bundle: $(COPY_JDK_IMAGE) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \ - $(BUILD_JDK_PLIST) + $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set: $(COPY_JDK_IMAGE) $(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR)) + $(TOUCH) $@ - jre-bundle: $(COPY_JRE_IMAGE) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \ - $(BUILD_JRE_PLIST) + $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set: $(COPY_JRE_IMAGE) $(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR)) + $(TOUCH) $@ + + jdk-bundle: $(COPY_JDK_IMAGE) $(COPY_LIBJLI_JDK) \ + $(BUILD_JDK_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set + + jre-bundle: $(COPY_JRE_IMAGE) $(COPY_LIBJLI_JRE) \ + $(BUILD_JRE_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set else # Not macosx