Author: mherger
Date: Fri Feb 26 04:05:54 2010
New Revision: 8584
URL: http://svn.slimdevices.com/jive?rev=8584&view=rev
Log:
Bug: n/a
Description: use build specific mount points to prevent file name conflicts
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.5/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=8584&r1=8583&r2=8584&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.am Fri Feb 26 04:05:54 2010
@@ -69,6 +69,7 @@
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
+DMG_IMAGE_DIR_MOUNTPOINT = $(DMG_TEMP_DIR)-$(VERSION_TEXT)
DMG_TMP_IMAGE_FILENAME = $(DMG_TEMP_DIR).dmg
DMG_IMAGE_FILENAME = SqueezePlay.dmg
@@ -121,11 +122,12 @@
rm -rf $(DMG_TEMP_DIR)
-rm $(DMG_TMP_IMAGE_FILENAME)
mkdir -p $(DMG_TEMP_DIR)
- -hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
- hdiutil create -fs HFS+ -layout SPUD -volname "$(DMG_IMAGE_DIR)" -size
100m "$(DMG_TEMP_DIR)"
+ -hdiutil detach "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
+ -rm -rf "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
+ hdiutil create -fs HFS+ -layout SPUD -volname
"$(DMG_IMAGE_DIR_MOUNTPOINT)" -size 100m "$(DMG_TEMP_DIR)"
hdiutil mount "$(DMG_TMP_IMAGE_FILENAME)"
- /Developer/Tools/CpMac -r $(BUNDLE_NAME) /Volumes/$(DMG_IMAGE_DIR)
- hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
+ /Developer/Tools/CpMac -r $(BUNDLE_NAME)
/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)
+ hdiutil detach "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=8584&r1=8583&r2=8584&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/Makefile.in Fri Feb 26 04:05:54 2010
@@ -280,6 +280,7 @@
ICNS_NAME = icon.icns
DMG_TEMP_DIR = temp-SqueezePlay_image
DMG_IMAGE_DIR = SqueezePlay_image
+DMG_IMAGE_DIR_MOUNTPOINT = $(DMG_TEMP_DIR)-$(VERSION_TEXT)
DMG_TMP_IMAGE_FILENAME = $(DMG_TEMP_DIR).dmg
DMG_IMAGE_FILENAME = SqueezePlay.dmg
@@ -1308,13 +1309,13 @@
rm -rf $(DMG_TEMP_DIR)
-rm $(DMG_TMP_IMAGE_FILENAME)
mkdir -p $(DMG_TEMP_DIR)
- -hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
+ -hdiutil detach "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
-umount -f /Volumes/$(DMG_IMAGE_DIR)*
- -rm -rf "/Volumes/$(DMG_IMAGE_DIR)"
- hdiutil create -fs HFS+ -layout SPUD -volname "$(DMG_IMAGE_DIR)" -size
100m "$(DMG_TEMP_DIR)"
+ -rm -rf "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
+ hdiutil create -fs HFS+ -layout SPUD -volname
"$(DMG_IMAGE_DIR_MOUNTPOINT)" -size 100m "$(DMG_TEMP_DIR)"
hdiutil mount "$(DMG_TMP_IMAGE_FILENAME)"
- /Developer/Tools/CpMac -r $(BUNDLE_NAME) /Volumes/$(DMG_IMAGE_DIR)
- hdiutil detach "/Volumes/$(DMG_IMAGE_DIR)"
+ /Developer/Tools/CpMac -r $(BUNDLE_NAME)
/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)
+ hdiutil detach "/Volumes/$(DMG_IMAGE_DIR_MOUNTPOINT)"
hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
