[banshee] [build] generate a banshee-1 launcher per platform



commit 29599c69d5e5f27e2324020253e6786ecafde976
Author: Aaron Bockover <abockover novell com>
Date:   Wed Jan 6 13:25:45 2010 -0500

    [build] generate a banshee-1 launcher per platform
    
    Moved the old banshee-1.in launcher to banshee-1.linux.in,
    and added a Darwin launcher, banshee-1.darwin.in. Depending
    on the host type at configure time, banshee-1 will be generated
    from either banshee-1.linux.in or banshee-1.darwin.in.
    
    Also fixed pango to include basic-atsui, and work around some
    strange build ordering.

 build/bundle/packages/pango.py                     |    3 +-
 configure.ac                                       |    5 +++-
 src/Clients/Booter/Makefile.am                     |    7 +++++
 src/Clients/Booter/banshee-1.darwin.in             |   25 ++++++++++++++++++++
 .../Booter/{banshee-1.in => banshee-1.linux.in}    |    1 -
 5 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/build/bundle/packages/pango.py b/build/bundle/packages/pango.py
index 72934ed..45ef478 100644
--- a/build/bundle/packages/pango.py
+++ b/build/bundle/packages/pango.py
@@ -7,7 +7,8 @@ package = {
 		'http://ftp.gnome.org/pub/gnome/sources/%{name}/%{version_major}/%{name}-%{version}.tar.gz'
 	],
 	'build': [
-		'%{__configure} --without-x',
+		'%{__configure} --without-x --with-included-modules=basic-atsui',
+		'%{__make} -k -C modules || true',
 		'%{__make}'
 	]
 }
diff --git a/configure.ac b/configure.ac
index a6ce0b1..ec908ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,6 +188,8 @@ AC_SUBST(BUILD_HOST_OS)
 AC_SUBST(BUILD_HOST_CPU)
 AC_SUBST(BUILD_TIME)
 
+AM_CONDITIONAL(PLATFORM_DARWIN, test "x${host_os:0:6}" = "xdarwin")
+
 SHAVE_INIT([build/m4/shave], [enable])
 
 dnl generated files
@@ -230,7 +232,8 @@ src/AssemblyInfo.cs
 src/Clients/Makefile
 src/Clients/Beroe/Makefile
 src/Clients/Booter/Makefile
-src/Clients/Booter/banshee-1
+src/Clients/Booter/banshee-1.linux
+src/Clients/Booter/banshee-1.darwin
 src/Clients/Halie/Makefile
 src/Clients/Muinshee/Makefile
 src/Clients/Nereid/Makefile
diff --git a/src/Clients/Booter/Makefile.am b/src/Clients/Booter/Makefile.am
index e6b823a..fc37e37 100644
--- a/src/Clients/Booter/Makefile.am
+++ b/src/Clients/Booter/Makefile.am
@@ -9,5 +9,12 @@ bin_SCRIPTS = banshee-1
 EXTRA_DIST += Banshee.exe.config
 module_SCRIPTS += Banshee.exe.config
 
+if PLATFORM_DARWIN
+banshee-1: banshee-1.darwin
+else
+banshee-1: banshee-1.linux
+endif
+	cp $< $@
+
 install-exec-hook:
 	$(LN_S) -f banshee-1 $(DESTDIR)$(bindir)/muinshee
diff --git a/src/Clients/Booter/banshee-1.darwin.in b/src/Clients/Booter/banshee-1.darwin.in
new file mode 100644
index 0000000..b5fa1f0
--- /dev/null
+++ b/src/Clients/Booter/banshee-1.darwin.in
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+APP_ROOT="$(dirname $0)"
+[[ "${APP_ROOT:0:1}" = / ]] || BUNDLE_ROOT="$(pwd)/$APP_ROOT"
+
+cd "$APP_ROOT"
+
+export DYLD_LIBRARY_PATH="$APP_ROOT/lib:$APP_ROOT/lib/banshee-1"
+export GST_PLUGIN_SYSTEM_PATH="$APP_ROOT/lib/gstreamer-0.10"
+export BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
+
+MONO_BIN="bin/mono"
+MONO_EXE="lib/banshee-1/Nereid.exe"
+MONO_OPTIONS=""
+BANSHEE_OPTIONS=""
+BANSHEE_EXEC_NAME=Banshee
+
+for arg in $*; do
+	if [ "$arg" = --debug ]; then
+		MONO_OPTIONS="$MONO_OPTIONS --debug"
+		BANSHEE_OPTIONS="$BANSHEE_OPTIONS --debug"
+	fi
+done
+
+exec -a $BANSHEE_EXEC_NAME $MONO_BIN $MONO_OPTIONS $MONO_EXEC $BANSHEE_OPTIONS
diff --git a/src/Clients/Booter/banshee-1.in b/src/Clients/Booter/banshee-1.linux.in
similarity index 94%
rename from src/Clients/Booter/banshee-1.in
rename to src/Clients/Booter/banshee-1.linux.in
index 6ad1e85..2022659 100644
--- a/src/Clients/Booter/banshee-1.in
+++ b/src/Clients/Booter/banshee-1.linux.in
@@ -7,7 +7,6 @@ MONO_EXE="@expanded_libdir@/@PACKAGE@/$exec_asm"
 BANSHEE_EXEC_NAME=$(basename $0)
 BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
 
-export DYLD_LIBRARY_PATH= expanded_libdir@:@expanded_libdir@/@PACKAGE ${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
 export LD_LIBRARY_PATH= expanded_libdir@:@expanded_libdir@/@PACKAGE ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
 export GST_PLUGIN_PATH= expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
 if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]