banshee r4731 - trunk/banshee/build/osx

[abock svn gnome org]

Author: abock
Date: Fri Oct 24 18:26:57 2008
New Revision: 4731
URL: http://svn.gnome.org/viewvc/banshee?rev=4731&view=rev

Log:
Merged collect-deps and make-app-bundle into a single pass, fixed symlink and relocation issue

Removed:
   trunk/banshee/build/osx/collect-deps.sh
Modified:
   trunk/banshee/build/osx/make-app-bundle.sh

Modified: trunk/banshee/build/osx/make-app-bundle.sh
==============================================================================
--- trunk/banshee/build/osx/make-app-bundle.sh	(original)
+++ trunk/banshee/build/osx/make-app-bundle.sh	Fri Oct 24 18:26:57 2008
@@ -1,19 +1,58 @@
 #!/bin/bash
 
 pushd $(dirname $0) &>/dev/null
+source build.env || exit $?
 
-./collect-deps.sh
+APP_DIR=Banshee.app
+BUNDLE=$APP_DIR/Contents/MacOS
+LIB_PREFIX=$BUILD_PREFIX/lib
+
+[[ -d "${LIB_PREFIX}" ]] || {
+	echo "ERROR: ${LIB_PREFIX} does not exist; dependencies must first be built"
+	exit 1
+}
 
-rm -rf Banshee.app
+rm -rf $APP_DIR
 cp -rf app-bundle-data Banshee.app
+cp -rf ../../bin/* $BUNDLE
+cp -rf glib-sharp-workaround $BUNDLE
 
-DEST=Banshee.app/Contents/MacOS
+mkdir $BUNDLE/gstreamer-0.10
 
-cp -rf bundle-deps/* $DEST
-cp -rf ../../bin/* $DEST
-cp -rf glib-sharp-workaround $DEST
+# Copy all runtime dependencies for bundling
+cp $BUILD_PREFIX/bin/{gst-launch,gst-inspect}-0.10 $BUNDLE &>/dev/null
+find $LIB_PREFIX -name *.dylib -type f -exec cp {} $BUNDLE \; &>/dev/null
+find $LIB_PREFIX/gstreamer-0.10 -name *.so -type f -exec cp {} $BUNDLE/gstreamer-0.10 \; &>/dev/null
+find $LIB_PREFIX/mono -name *.dll* -not -name *policy* -type f -exec cp {} $BUNDLE \; &>/dev/null
+
+# Nuke any dangling chads
+find $APP_DIR -type d -iregex '.*\.svn$' | xargs rm -rf
+
+pushd $BUNDLE &>/dev/null
+
+# Rebuild symlinks
+for link in $(find $LIB_PREFIX -name \*.dylib -type l); do
+	ln -s "$(basename $(readlink $link))" "$(basename $link)"
+done
+
+# Relocate libraries
+for dep in $(find . -type f \( -name \*.dylib -o -name \*.so -o -name gst-\*-\*.\* \)); do
+	echo -n "Processing $dep: "
+	relocs=0
+	
+	link_deps=$(otool -L $dep | cut -f2 | cut -f1 -d' ')
+	dep_id=./$(basename $(otool -D $dep | tail -n1))
+
+	for link_dep in $link_deps; do
+		if [ "x${link_dep:0:${#LIB_PREFIX}}" = "x$LIB_PREFIX" ]; then
+			install_name_tool -change $link_dep ./$(basename $link_dep) -id $dep_id $dep
+			relocs=$(($relocs + 1))
+		fi
+	done
 
-find Banshee.app -type d -iregex '.*\.svn$' | xargs rm -rf
+	echo "$relocs relocations"
+done
 
 popd &>/dev/null
+popd &>/dev/null