[banshee] OS X Build: Work with new bockbuild, add MonoMac
- From: Aaron Bockover <abock src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] OS X Build: Work with new bockbuild, add MonoMac
- Date: Fri, 4 Mar 2011 20:09:35 +0000 (UTC)
commit b17e5b03a944c1904c62a622bb61374870446b32
Author: Aaron Bockover <aaron abock org>
Date: Fri Mar 4 15:07:30 2011 -0500
OS X Build: Work with new bockbuild, add MonoMac
The profile in bockbuild changed, so update that in bootstrap-bundle
and add --disable-appledevice to profile-configure. Link against and
bundle MonoMac, now required by configure, though not yet integrated
in code.
bootstrap-bundle | 2 +-
build/build.environment.mk | 2 +-
build/m4/banshee/osx.m4 | 5 +++++
profile-configure | 3 ++-
src/Backends/Banshee.Osx/Banshee.Osx.csproj | 1 +
src/Backends/Banshee.Osx/Makefile.am | 15 +++++++++++++++
6 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/bootstrap-bundle b/bootstrap-bundle
index ca32db6..5f172d4 100755
--- a/bootstrap-bundle
+++ b/bootstrap-bundle
@@ -15,7 +15,7 @@ if test -z "$profile_name"; then
esac
fi
-profile="profile.$profile_name.py"
+profile="$profile_name.py"
if ! test -f "../bockbuild/profiles/banshee/$profile"; then
echo "Profile does not exist: build/bundle/$profile"
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 5dd05ae..87ebfea 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -171,7 +171,7 @@ REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEP
REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS)
-REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(MONOMAC_LIBS)
REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
# Cute hack to replace a space with something
diff --git a/build/m4/banshee/osx.m4 b/build/m4/banshee/osx.m4
index 1e0688c..bc841f3 100644
--- a/build/m4/banshee/osx.m4
+++ b/build/m4/banshee/osx.m4
@@ -4,6 +4,11 @@ AC_DEFUN([BANSHEE_CHECK_OSX],
if test "x${host_os%${host_os#??????}}" = "xdarwin"; then
enable_osx="yes"
PKG_CHECK_MODULES(IGEMACINTEGRATION, ige-mac-integration >= 0.8.6)
+ PKG_CHECK_MODULES(MONOMAC, monomac >= 0.7)
+ MONOMAC_ASSEMBLIES=`$PKG_CONFIG --variable=Libraries monomac`
+ AC_SUBST(MONOMAC_LIBS)
+ AC_SUBST(MONOMAC_ASSEMBLIES)
fi
+
AM_CONDITIONAL([PLATFORM_DARWIN], [test "x$enable_osx" = "xyes"])
])
diff --git a/profile-configure b/profile-configure
index 0363574..3b523ce 100755
--- a/profile-configure
+++ b/profile-configure
@@ -3,8 +3,9 @@
profiles=(
"darwin
--disable-mtp
- --disable-daap
+ --disable-appledevice
--disable-ipod
+ --disable-daap
--disable-boo
--disable-gnome
--disable-webkit
diff --git a/src/Backends/Banshee.Osx/Banshee.Osx.csproj b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
index d3f1192..5ef2d12 100644
--- a/src/Backends/Banshee.Osx/Banshee.Osx.csproj
+++ b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
@@ -70,6 +70,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..bin\Mono.Posix.dll</HintPath>
</Reference>
+ <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral" />
</ItemGroup>
<ItemGroup>
<Compile Include="Banshee.OsxBackend\HardwareManager.cs" />
diff --git a/src/Backends/Banshee.Osx/Makefile.am b/src/Backends/Banshee.Osx/Makefile.am
index a2642f2..9c71e4d 100644
--- a/src/Backends/Banshee.Osx/Makefile.am
+++ b/src/Backends/Banshee.Osx/Makefile.am
@@ -18,8 +18,23 @@ SOURCES = \
RESOURCES = Banshee.Osx.addin.xml
+EXTRA_BUNDLE = $(MONOMAC_ASSEMBLIES)
+
if PLATFORM_DARWIN
include $(top_srcdir)/build/build.mk
+
+define EXTRA_INSTALL_DATA_HOOK
+ for ASM in $(MONOMAC_ASSEMBLIES); do \
+ $(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+ done;
+endef
+
+define EXTRA_UNINSTALL_HOOK
+ for ASM in $(MONOMAC_ASSEMBLIES); do \
+ rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+ done;
+endef
+
else
EXTRA_DIST = $(SOURCES) $(RESOURCES)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]