banshee r4736 - in trunk/banshee/build/osx: . app-bundle-data/Contents/MacOS glib-sharp-workaround targets

From: abock svn gnome org
To: svn-commits-list gnome org
Subject: banshee r4736 - in trunk/banshee/build/osx: . app-bundle-data/Contents/MacOS glib-sharp-workaround targets
Date: Fri, 24 Oct 2008 22:25:04 +0000 (UTC)
Author: abock
Date: Fri Oct 24 22:25:04 2008
New Revision: 4736
URL: http://svn.gnome.org/viewvc/banshee?rev=4736&view=rev

Log:
Lots of build fixes

Added:
   trunk/banshee/build/osx/build-deps.profile
   trunk/banshee/build/osx/targets/bundle-00-base-libs.targets
      - copied, changed from r4734, /trunk/banshee/build/osx/targets/oss-00-base-libs.targets
   trunk/banshee/build/osx/targets/bundle-10-xiph-libs.targets
      - copied unchanged from r4734, /trunk/banshee/build/osx/targets/oss-05-xiph-libs.targets
   trunk/banshee/build/osx/targets/bundle-20-extra-libs.targets
      - copied unchanged from r4734, /trunk/banshee/build/osx/targets/oss-10-extra-libs.targets
   trunk/banshee/build/osx/targets/bundle-30-gstreamer.targets
      - copied, changed from r4734, /trunk/banshee/build/osx/targets/oss-20-gstreamer.targets
   trunk/banshee/build/osx/targets/bundle-40-managed-libs.targets
      - copied unchanged from r4734, /trunk/banshee/build/osx/targets/oss-40-managed-libs.targets
   trunk/banshee/build/osx/targets/gettext.targets
Removed:
   trunk/banshee/build/osx/glib-sharp-workaround/
   trunk/banshee/build/osx/targets/oss-00-base-libs.targets
   trunk/banshee/build/osx/targets/oss-05-xiph-libs.targets
   trunk/banshee/build/osx/targets/oss-10-extra-libs.targets
   trunk/banshee/build/osx/targets/oss-20-gstreamer.targets
   trunk/banshee/build/osx/targets/oss-40-managed-libs.targets
Modified:
   trunk/banshee/build/osx/app-bundle-data/Contents/MacOS/runtime.env
   trunk/banshee/build/osx/build-deps.sh
   trunk/banshee/build/osx/build.env
   trunk/banshee/build/osx/make-app-bundle.sh

Modified: trunk/banshee/build/osx/app-bundle-data/Contents/MacOS/runtime.env
==============================================================================
--- trunk/banshee/build/osx/app-bundle-data/Contents/MacOS/runtime.env	(original)
+++ trunk/banshee/build/osx/app-bundle-data/Contents/MacOS/runtime.env	Fri Oct 24 22:25:04 2008
@@ -6,6 +6,4 @@
 #export GST_REGISTRY_FORK=no
 export GST_PLUGIN_SYSTEM_PATH=$BIN_PATH/gstreamer-0.10
 export DYLD_FALLBACK_LIBRARY_PATH=$BIN_PATH:$MONO_FRAMEWORK_PATH/lib:/usr/lib:/lib${DYLD_FALLBACK_LIBRARY_PATH+:$DYLD_FALLBACK_LIBRARY_PATH}
-export MONO_PATH=$BIN_PATH/glib-sharp-workaround
-
 

Added: trunk/banshee/build/osx/build-deps.profile
==============================================================================
--- (empty file)
+++ trunk/banshee/build/osx/build-deps.profile	Fri Oct 24 22:25:04 2008
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./build-deps.sh -r bundle
+./build-deps.sh -r gettext
+

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 22:25:04 2008
@@ -4,6 +4,14 @@
 BUILD_LOG=`pwd`/build-log
 
 pushd $(dirname $0) &>/dev/null
+
+if [[ $# -eq 0 && -f build-deps.profile ]]; then
+	echo "No arguments passed and found a profile, so running the profile"
+	echo 
+	/bin/bash ./build-deps.profile
+	exit 1
+fi
+
 source build.env || exit $?
 
 function show_help () {
@@ -57,26 +65,34 @@
 	done
 }
 
+ROOT_NAME=bundle
+expect_root=0
+
 for arg in $@; do
 	case $arg in
 		-v|--verbose) VERBOSE=1 ;;
 		-h|--help)    show_help ;;
+		-r|--root)    expect_root=1 ;;
 		-*)           bail "Unknown argument: $arg" 1 ;;
-		*)            append_target $arg ;;
+		*)            [[ $expect_root -eq 1 ]] && { ROOT_NAME=$arg; expect_root=0; } || append_target $arg ;;
 	esac
 done
 
+BUILD_PREFIX="$(dirname $BUILD_PREFIX)/${ROOT_NAME}-install"
+
 if [ ${#ALL_TARGETS[ ]} -eq 0 ]; then
-	for target_file in $(find $(dirname $0)/targets -maxdepth 1 -name \*.targets); do
+	for target_file in $(find $(dirname $0)/targets -maxdepth 1 -name $ROOT_NAME\*.targets); do
 		append_target $target_file
 	done
 fi
 
-SOURCES_ROOT=deps/bundle-sources
+SOURCES_ROOT="deps/${ROOT_NAME}-sources"
 mkdir -p $SOURCES_ROOT
 pushd $SOURCES_ROOT &>/dev/null
 
 echo "Starting to build all targets..."
+echo "--> Root Name:    ${ROOT_NAME}"
+echo "--> Build Prefix: ${BUILD_PREFIX}"
 echo
 
 for ((i = 0, n = ${#ALL_TARGETS[ ]}; i < n; i++)); do
@@ -114,7 +130,7 @@
 
 	pushd $TARGET_DIR &>/dev/null
 		if [ ! -f patched ]; then
-			patches=$(find ../.. -maxdepth 1 -name ${TARGET_NAME}\*.patch)
+			patches=$(find ../../.. -maxdepth 2 -name ${TARGET_NAME}\*.patch)
 			for patch in $patches; do
 				echo "--> Running: patch -p0 < $patch"
 				patch -p0 < $patch 1>/dev/null || bail "Could not apply patch $patch to $TARGET_NAME" $?

Modified: trunk/banshee/build/osx/build.env
==============================================================================
--- trunk/banshee/build/osx/build.env	(original)
+++ trunk/banshee/build/osx/build.env	Fri Oct 24 22:25:04 2008
@@ -21,10 +21,11 @@
 # 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`/deps/bundle-install"
+ROOTS_PREFIX="$(pwd)/deps"
+BUILD_PREFIX="${ROOTS_PREFIX}/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"
+export PATH="$BUILD_PREFIX/bin:$ROOTS_PREFIX/gettext-install/bin:$MONO_SDK_PATH/bin:/usr/bin:/bin"
 export LDFLAGS="-L$BUILD_PREFIX/lib -L$MONO_SDK_PATH/lib $LDFLAGS"
 export CFLAGS="-I$BUILD_PREFIX/inlcude -I$MONO_SDK_PATH/include -isysroot $MAC_SDK_PATH -mmacosx-version-min=10.4 $CFLAGS"
 export LD_LIBRARY_PATH="$BUILD_PREFIX/lib:$MONO_SDK_PATH/lib:$LD_LIBRARY_PATH"

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 22:25:04 2008
@@ -15,7 +15,6 @@
 rm -rf $APP_DIR
 cp -rf app-bundle-data Banshee.app
 cp -rf ../../bin/* $BUNDLE
-cp -rf glib-sharp-workaround $BUNDLE
 
 mkdir $BUNDLE/gstreamer-0.10
 

Copied: trunk/banshee/build/osx/targets/bundle-00-base-libs.targets (from r4734, /trunk/banshee/build/osx/targets/oss-00-base-libs.targets)
==============================================================================
--- /trunk/banshee/build/osx/targets/oss-00-base-libs.targets	(original)
+++ trunk/banshee/build/osx/targets/bundle-00-base-libs.targets	Fri Oct 24 22:25:04 2008
@@ -1,7 +1,6 @@
 TARGETS=(
     # name (%n)        version (%v)  dir (%d)  file (%f)   download uri                    configure args
     "libxml2           2.6.30        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/%f";
-    "gettext           0.17          %n-%v     %d.tar.gz   http://ftp.gnu.org/pub/gnu/gettext/%f  --without-emacs --disable-java"
     "intltool          0.40.5        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/%f";
     "libsoup           2.24.1        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/libsoup/2.24/%f  --disable-gtk-doc"
 )

Copied: trunk/banshee/build/osx/targets/bundle-30-gstreamer.targets (from r4734, /trunk/banshee/build/osx/targets/oss-20-gstreamer.targets)
==============================================================================
--- /trunk/banshee/build/osx/targets/oss-20-gstreamer.targets	(original)
+++ trunk/banshee/build/osx/targets/bundle-30-gstreamer.targets	Fri Oct 24 22:25:04 2008
@@ -3,7 +3,7 @@
 
 TARGETS=(
     # name (%n)        version (%v)  dir (%d)  file (%f)   download uri                               configure args
-    "liboil            0.3.15        %n-%v     %d.tar.gz   http://liboil.freedesktop.org/download/%f  ${GST_CONFIGURE_ARGS}"
+#    "liboil            0.3.15        %n-%v     %d.tar.gz   http://liboil.freedesktop.org/download/%f  ${GST_CONFIGURE_ARGS}"
     "gstreamer         0.10.21       %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS}"
     "gst-plugins-base  0.10.21       %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS} --disable-x --disable-xvideo --disable-xshm --disable-gio --disable-gnome_vfs"
     "gst-plugins-good  0.10.10       %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS} --disable-x --disable-xvideo --disable-xshm --disable-gdk_pixbuf --disable-cairo --disable-jpeg --disable-libpng --disable-annodex"

Added: trunk/banshee/build/osx/targets/gettext.targets
==============================================================================
--- (empty file)
+++ trunk/banshee/build/osx/targets/gettext.targets	Fri Oct 24 22:25:04 2008
@@ -0,0 +1,4 @@
+TARGETS=(
+    # name (%n)        version (%v)  dir (%d)  file (%f)   download uri                    configure args
+    "gettext           0.17          %n-%v     %d.tar.gz   http://ftp.gnu.org/pub/gnu/gettext/%f  --without-emacs --disable-java"
+)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]