Author: tom
Date: Mon Sep 29 13:17:35 2008
New Revision: 3014
URL: http://svn.slimdevices.com?rev=3014&root=Jive&view=rev
Log:
another attempt to make dmg image work, will try in build system
Modified:
7.3/trunk/squeezeplay/src/Makefile.osx
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.osx?rev=3014&root=Jive&r1=3013&r2=3014&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.osx Mon Sep 29 13:17:35 2008
@@ -214,7 +214,7 @@
squeezeplay: squeezeplay/Makefile
export PATH=$(BUILD_TOP)/bin:$(PATH); \
- cd squeezeplay; make && make install && make SqueezePlay_bundle
+ cd squeezeplay; make && make install && make SqueezePlay_dmg
squeezeplay_desktop/Makefile:
cd squeezeplay_desktop; SDL_CONFIG=${SDL_CONFIG} ./configure
--prefix=${PREFIX}
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3014&root=Jive&r1=3013&r2=3014&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Mon Sep 29 13:17:35 2008
@@ -54,7 +54,10 @@
VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n
..|sed "s/M$$//g")
ICNS_NAME = icon.icns
-DMG_DIR = SqueezePlay_dmg
+DMG_TEMP_DIR = temp-SqueezePlay_image
+DMG_IMAGE_DIR = SqueezePlay_image
+DMG_TMP_IMAGE_FILENAME = $(DMG_TEMP_DIR).dmg
+DMG_IMAGE_FILENAME = SqueezePlay.dmg
#todo: make clean work the right way(not the rm -rf hackery seen below)
SqueezePlay_bundle: SqueezePlay
@@ -100,11 +103,20 @@
cp -Rp $(BUNDLE_NAME) $(OSX_BUILD_DIR)
SqueezePlay_dmg: SqueezePlay_bundle
- mkdir -p $(DMG_DIR)
- /Developer/Tools/CpMac -r $(BUNDLE_NAME) ./$(DMG_DIR)/
- rm -rf $(DMG_DIR)
-
- ##hdiutil create -srcfolder $(DMG_DIR) $(OSX_BUILD_DIR)/SqueezePlay.dmg
+ ##following image creation model basd on sc buildme.pl (might avoid
build system hang on hdiutil cmd
+ rm -rf $(DMG_IMAGE_DIR)
+ 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+ -volname "$(DMG_IMAGE_DIR)" -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)"
+ hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
+ rm -rf $(DMG_IMAGE_DIR)
+ rm -rf $(DMG_TEMP_DIR)
+ rm $(DMG_TMP_IMAGE_FILENAME)
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3014&root=Jive&r1=3013&r2=3014&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Mon Sep 29 13:17:35 2008
@@ -269,6 +269,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -289,6 +290,7 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -301,6 +303,7 @@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -384,7 +387,10 @@
PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n
..|sed "s/M$$//g")
ICNS_NAME = icon.icns
-DMG_DIR = SqueezePlay_dmg
+DMG_TEMP_DIR = temp-SqueezePlay_image
+DMG_IMAGE_DIR = SqueezePlay_image
+DMG_TMP_IMAGE_FILENAME = $(DMG_TEMP_DIR).dmg
+DMG_IMAGE_FILENAME = SqueezePlay.dmg
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
@@ -2527,9 +2533,19 @@
cp -Rp $(BUNDLE_NAME) $(OSX_BUILD_DIR)
SqueezePlay_dmg: SqueezePlay_bundle
- mkdir -p $(DMG_DIR)
- /Developer/Tools/CpMac -r $(BUNDLE_NAME) ./$(DMG_DIR)/
- rm -rf $(DMG_DIR)
+ rm -rf $(DMG_IMAGE_DIR)
+ 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+ -volname "$(DMG_IMAGE_DIR)" -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)"
+ hdiutil convert -ov -format UDZO "$(DMG_TMP_IMAGE_FILENAME)" -o
"$(DMG_IMAGE_FILENAME)"
+ rm -rf $(DMG_IMAGE_DIR)
+ rm -rf $(DMG_TEMP_DIR)
+ rm $(DMG_TMP_IMAGE_FILENAME)
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
