changeset 6539:8e7195ce61f1

8022734: [macosx] Rebuilding jdk 7u on Mac almost always fails Summary: Build script needs to delete the j2sdk-server-bundle directory before copying/linking Reviewed-by: erikj, robilad, tbell Contributed-by: david.dehaven@oracle.com
author coffeys
date Tue, 13 Aug 2013 16:57:25 +0100
parents 1afb03696eb7
children 39741e3aa566
files make/common/Release-macosx.gmk
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release-macosx.gmk	Tue Aug 13 15:31:18 2013 +0400
+++ b/make/common/Release-macosx.gmk	Tue Aug 13 16:57:25 2013 +0100
@@ -58,6 +58,9 @@
 jdk-bundle-setup:
 	$(RM) -r $(JDK_BUNDLE_DIR)
 
+jdk-server-bundle-setup:
+	$(RM) -r $(JDK_SERVER_BUNDLE_DIR)
+
 jre-bundle-files:
 	$(MKDIR) -p $(JRE_BUNDLE_DIR)/MacOS
 	ln -s ../Home/lib/jli/libjli.dylib $(JRE_BUNDLE_DIR)/MacOS/
@@ -79,6 +82,6 @@
 	$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" -e "s/@@NAME@@/$(BUNDE_NAME_JDK)/g" -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" < $(MACOSX_SRC)/bundle/JDK-Info.plist > $(JDK_SERVER_BUNDLE_DIR)/Info.plist
 	/usr/bin/SetFile -a B $(JDK_SERVER_BUNDLE_DIR)/../
 
-EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
+EXTRA_IMAGE_TARGETS += jre-bundle-setup jdk-bundle-setup jdk-server-bundle-setup jre-bundle-files jdk-bundle-files jdk-server-bundle-files
 
 .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS)