banshee r4710 - trunk/banshee/build/osx

[abock svn gnome org]

Author: abock
Date: Tue Oct 21 21:01:44 2008
New Revision: 4710
URL: http://svn.gnome.org/viewvc/banshee?rev=4710&view=rev

Log:
Remove mono-addins for real, collect .mdb files, add share/pkgconfig to search path for finding the SDK mono addins

Modified:
   trunk/banshee/build/osx/build.env
   trunk/banshee/build/osx/collect-deps.sh
   trunk/banshee/build/osx/oss-40-managed-libs.targets

Modified: trunk/banshee/build/osx/build.env
==============================================================================
--- trunk/banshee/build/osx/build.env	(original)
+++ trunk/banshee/build/osx/build.env	Tue Oct 21 21:01:44 2008
@@ -10,7 +10,10 @@
 BUILD_PREFIX="`pwd`/bundle-deps-build"
 
 # Build configuration. Really, no reason to touch this.
-export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$BUILD_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
+# TODO: This really needs trimming and verifying. I think we are 
+#       pulling in way too much stuff here, criss crossing environments
+
+export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig:$BUILD_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PATH="$MACPORTS_SDK_PATH:$MONO_SDK_PATH/bin:$PATH"
 export LDFLAGS="-L$MONO_SDK_PATH/lib $LDFLAGS"
 export CFLAGS="-I$BUILD_PREFIX/inlcude -isysroot $MAC_SDK_PATH -mmacosx-version-min=10.4 -I$MONO_SDK_PATH/include $CFLAGS"

Modified: trunk/banshee/build/osx/collect-deps.sh
==============================================================================
--- trunk/banshee/build/osx/collect-deps.sh	(original)
+++ trunk/banshee/build/osx/collect-deps.sh	Tue Oct 21 21:01:44 2008
@@ -13,7 +13,7 @@
 cp $BUILD_PREFIX/bin/{gst-launch,gst-inspect}-0.10 $BUNDLE &>/dev/null
 find $BUILD_PREFIX/lib -name *.dylib -type f -exec cp {} $BUNDLE \; &>/dev/null
 find $BUILD_PREFIX/lib/gstreamer-0.10 -name *.so -type f -exec cp {} $BUNDLE/gstreamer-0.10 \; &>/dev/null
-find $BUILD_PREFIX/lib/mono -name *.dll -not -name *policy* -type f -exec cp {} $BUNDLE \; &>/dev/null
+find $BUILD_PREFIX/lib/mono -name *.dll* -not -name *policy* -type f -exec cp {} $BUNDLE \; &>/dev/null
 
 popd &>/dev/null
 

Modified: trunk/banshee/build/osx/oss-40-managed-libs.targets
==============================================================================
--- trunk/banshee/build/osx/oss-40-managed-libs.targets	(original)
+++ trunk/banshee/build/osx/oss-40-managed-libs.targets	Tue Oct 21 21:01:44 2008
@@ -5,5 +5,4 @@
     "ndesk-dbus        0.6.0         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
     "ndesk-dbus-glib   0.4.1         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
     "taglib-sharp      2.0.3.0       %n-%v     %d.tar.gz   http://www.taglib-sharp.com/Download/%f    --disable-docs"
-    "mono-addins       0.3.1         %n-%v     %d.tar.bz2  http://go-mono.com/sources/mono-addins/%f  --disable-docs"
 )