banshee r4734 - in trunk/banshee/build/osx: . targets

[abock svn gnome org]

Author: abock
Date: Fri Oct 24 20:25:07 2008
New Revision: 4734
URL: http://svn.gnome.org/viewvc/banshee?rev=4734&view=rev

Log:
Moving some things around to support multiple build roots

Added:
   trunk/banshee/build/osx/targets/
   trunk/banshee/build/osx/targets/gst-plugins-base-docs-fix.patch
      - copied unchanged from r4726, /trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch
   trunk/banshee/build/osx/targets/gstreamer-docs-fix.patch
      - copied unchanged from r4726, /trunk/banshee/build/osx/gstreamer-docs-fix.patch
   trunk/banshee/build/osx/targets/oss-00-base-libs.targets
      - copied unchanged from r4726, /trunk/banshee/build/osx/oss-00-base-libs.targets
   trunk/banshee/build/osx/targets/oss-05-xiph-libs.targets
      - copied unchanged from r4726, /trunk/banshee/build/osx/oss-05-xiph-libs.targets
   trunk/banshee/build/osx/targets/oss-10-extra-libs.targets
      - copied unchanged from r4726, /trunk/banshee/build/osx/oss-10-extra-libs.targets
   trunk/banshee/build/osx/targets/oss-20-gstreamer.targets
      - copied unchanged from r4726, /trunk/banshee/build/osx/oss-20-gstreamer.targets
   trunk/banshee/build/osx/targets/oss-40-managed-libs.targets
      - copied unchanged from r4726, /trunk/banshee/build/osx/oss-40-managed-libs.targets
Removed:
   trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch
   trunk/banshee/build/osx/gstreamer-docs-fix.patch
   trunk/banshee/build/osx/oss-00-base-libs.targets
   trunk/banshee/build/osx/oss-05-xiph-libs.targets
   trunk/banshee/build/osx/oss-10-extra-libs.targets
   trunk/banshee/build/osx/oss-20-gstreamer.targets
   trunk/banshee/build/osx/oss-40-managed-libs.targets
Modified:
   trunk/banshee/build/osx/build-deps.sh
   trunk/banshee/build/osx/build.env
   trunk/banshee/build/osx/make-dmg-bundle.sh

Modified: trunk/banshee/build/osx/build-deps.sh
==============================================================================
--- trunk/banshee/build/osx/build-deps.sh	(original)
+++ trunk/banshee/build/osx/build-deps.sh	Fri Oct 24 20:25:07 2008
@@ -12,6 +12,7 @@
 	echo "Available Options:"
 	echo "  -h, --help        show this help"
 	echo "  -v, --verbose     show all build messages"
+	echo "  -r, --root        name of the build root (default=bundle)"
 	echo
 	exit 1
 }
@@ -48,7 +49,7 @@
 
 function append_target () {
 	FILE=$1
-	[[ -f $FILE ]] || FILE="$FILE.targets"
+	[[ -f $FILE ]] || { FILE="$FILE.targets"; [[ -f $FILE ]] || { FILE=targets/$FILE; }; }
 	source $FILE &>/dev/null || bail "Could not load target set '$FILE'" 1
 	echo "Loading target set '$FILE'"
 	for ((i = 0, n = ${#TARGETS[ ]}; i < n; i++)); do
@@ -66,12 +67,12 @@
 done
 
 if [ ${#ALL_TARGETS[ ]} -eq 0 ]; then
-	for target_file in $(find $(dirname $0) -maxdepth 1 -name \*.targets); do
+	for target_file in $(find $(dirname $0)/targets -maxdepth 1 -name \*.targets); do
 		append_target $target_file
 	done
 fi
 
-SOURCES_ROOT=bundle-deps-src
+SOURCES_ROOT=deps/bundle-sources
 mkdir -p $SOURCES_ROOT
 pushd $SOURCES_ROOT &>/dev/null
 

Modified: trunk/banshee/build/osx/build.env
==============================================================================
--- trunk/banshee/build/osx/build.env	(original)
+++ trunk/banshee/build/osx/build.env	Fri Oct 24 20:25:07 2008
@@ -21,7 +21,7 @@
 # Where GStreamer and other Banshee dependencies that will
 # end up being bundled should be installed for the build.
 # It's generally a good idea to leave this alone.
-BUILD_PREFIX="`pwd`/bundle-deps-build"
+BUILD_PREFIX="`pwd`/deps/bundle-install"
 
 export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig"
 export PATH="$BUILD_PREFIX/bin:$MONO_SDK_PATH/bin:/usr/bin:/bin"

Modified: trunk/banshee/build/osx/make-dmg-bundle.sh
==============================================================================
--- trunk/banshee/build/osx/make-dmg-bundle.sh	(original)
+++ trunk/banshee/build/osx/make-dmg-bundle.sh	Fri Oct 24 20:25:07 2008
@@ -44,10 +44,10 @@
 echo "Creating distributable image..."
 hdiutil convert -quiet -format UDBZ -o $DMG_FILE $DMG_FILE.master
 
-echo "Installing end user license agreement..."
-hdiutil flatten -quiet $DMG_FILE
-/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE
-hdiutil unflatten -quiet $DMG_FILE
+#echo "Installing end user license agreement..."
+#hdiutil flatten -quiet $DMG_FILE
+#/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE
+#hdiutil unflatten -quiet $DMG_FILE
 
 echo "Done."