GNOME.org
 

[banshee] [OsxBackend] fix build to include OsxIntegration

commit 430024055aaa143cf1dcc6f431a7b6aee891823c
Author: Aaron Bockover <abockover novell com>
Date:   Wed Feb 24 15:55:56 2010 -0500

    [OsxBackend] fix build to include OsxIntegration
    
    Finally added a .csproj entry for the backend

 Banshee.sln                                    |   11 ++-
 build/build.environment.mk                     |    3 +-
 build/build.rules.mk                           |    2 +-
 src/Backends/Banshee.Osx/Banshee.Osx.addin.xml |    2 +-
 src/Backends/Banshee.Osx/Banshee.Osx.csproj    |   99 ++++++++++++++++++++++++
 src/Backends/Banshee.Osx/Makefile.am           |   15 +++-
 6 files changed, 122 insertions(+), 10 deletions(-)
---
diff --git a/Banshee.sln b/Banshee.sln
index 097b525..d89b3ff 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -54,6 +54,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Hal", "src\Backends
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.NowPlaying.X11", "src\Backends\Banshee.NowPlaying.X11\Banshee.NowPlaying.X11.csproj", "{46C02D13-5ED4-4A14-9ACF-125B1E4B6EB5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Banshee.Osx", "src\Backends\Banshee.Osx\Banshee.Osx.csproj", "{379034DF-F34D-409B-8DE9-097BE78E37C8}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dap", "Dap", "{057215DF-2773-4B42-8B8A-64F2CF7764F2}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -202,6 +204,12 @@ Global
 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Windows|Any CPU.Build.0 = Windows|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
+		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Windows|Any CPU.Build.0 = Windows|Any CPU
 		{3935AE8A-E283-4C0D-9094-7435A937DC90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3935AE8A-E283-4C0D-9094-7435A937DC90}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3935AE8A-E283-4C0D-9094-7435A937DC90}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
@@ -378,6 +386,7 @@ Global
 		{C1065582-4F64-4810-8C35-E7EB2D2A432C} = {A03B194F-F644-4E95-A602-87200029240D}
 		{3B7DD288-5546-4907-B302-0CD0271D9713} = {A03B194F-F644-4E95-A602-87200029240D}
 		{46C02D13-5ED4-4A14-9ACF-125B1E4B6EB5} = {A03B194F-F644-4E95-A602-87200029240D}
+		{379034DF-F34D-409B-8DE9-097BE78E37C8} = {A03B194F-F644-4E95-A602-87200029240D}
 		{BC2E94DF-7A82-461E-BE7C-60E41ADC3562} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{6B73E278-23FB-4A59-9B44-AB7F0212B936} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
 		{3935AE8A-E283-4C0D-9094-7435A937DC90} = {057215DF-2773-4B42-8B8A-64F2CF7764F2}
@@ -417,8 +426,6 @@ Global
 		{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1} = {4F47D6F1-4047-4A89-AE85-3AE5EF9F2961}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 1.3
-		outputpath = bin
 		StartupItem = src\Clients\Nereid\Nereid.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1
diff --git a/build/build.environment.mk b/build/build.environment.mk
index e170786..0e9b736 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -24,7 +24,6 @@ LINK_IPOD = $(IPODSHARP_LIBS)
 LINK_BOO = $(BOO_LIBS)
 LINK_WEBKIT = $(WEBKIT_LIBS)
 LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
-LINK_IGEMACINTEGRATION = $(IGEMACINTEGRATIONSHARP_LIBS)
 LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
 LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
 LINK_MONO_ADDINS_GUI_DEPS = $(MONO_ADDINS_GUI_LIBS)
@@ -152,7 +151,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) $(LINK_IGEMACINTEGRATION)
+REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
 
 # Cute hack to replace a space with something
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 7285267..5f72724 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -52,7 +52,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 	@mkdir -p $(top_builddir)/bin
 	@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
 		$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $  config) && \
-		$(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $  config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll $(SOURCES_BUILD); \
+		$(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $  config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibigemacintegration.dylib -iCFRelease $(SOURCES_BUILD); \
 	fi;
 	$(MCS) \
 		$(GMCS_FLAGS) \
diff --git a/src/Backends/Banshee.Osx/Banshee.Osx.addin.xml b/src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
index 03ffd43..51129b7 100644
--- a/src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
+++ b/src/Backends/Banshee.Osx/Banshee.Osx.addin.xml
@@ -3,7 +3,7 @@
     id="Banshee.Osx"
     version="1.0"
     compatVersion="1.0"
-    copyright="© 2008 Eoin Hennessy. Licensed under the MIT X11 license."
+    copyright="© 2009-2010 Novell Inc, © 2008 Eoin Hennessy. Licensed under the MIT X11 license."
     category="required:Backends"
     description="Backend providers for the OSX platform. Includes general OSX integration."
     defaultEnabled="true">
diff --git a/src/Backends/Banshee.Osx/Banshee.Osx.csproj b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
new file mode 100644
index 0000000..ab1a1aa
--- /dev/null
+++ b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <ProjectGuid>{379034DF-F34D-409B-8DE9-097BE78E37C8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <UseParentDirectoryAsNamespace>true</UseParentDirectoryAsNamespace>
+    <AssemblyName>Banshee.Osx</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <Optimize>true</Optimize>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <ReleaseVersion>1.3</ReleaseVersion>
+    <RootNamespace>Banshee.Osx</RootNamespace>
+    <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
+      <Project>{2ADB831A-A050-47D0-B6B9-9C19D60233BB}</Project>
+      <Name>Banshee.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Banshee.Services\Banshee.Services.csproj">
+      <Project>{B28354F0-BA87-44E8-989F-B864A3C7C09F}</Project>
+      <Name>Banshee.Services</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Libraries\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Libraries\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\Banshee.ThickClient\Banshee.ThickClient.csproj">
+      <Project>{AC839523-7BDF-4AB6-8115-E17921B96EC6}</Project>
+      <Name>Banshee.ThickClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="Mono.Posix" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Banshee.OsxBackend\HardwareManager.cs" />
+    <Compile Include="Banshee.OsxBackend\OsxService.cs" />
+    <Compile Include="OsxIntegration.Ige\IgeMacMenu.cs" />
+    <Compile Include="OsxIntegration.Ige\IgeMacMenuGroup.cs" />
+    <Compile Include="OsxIntegration.Framework\AppleEvent.cs" />
+    <Compile Include="OsxIntegration.Framework\ApplicationEvents.cs" />
+    <Compile Include="OsxIntegration.Framework\Carbon.cs" />
+    <Compile Include="OsxIntegration.Framework\CoreFoundation.cs" />
+    <Compile Include="OsxIntegration.Framework\HIToolbox.cs" />
+    <Compile Include="OsxIntegration.Framework\NavDialog.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Banshee.Osx.addin.xml">
+      <LogicalName>Banshee.Osx.addin.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am">
+          <BuildFilesVar Sync="true" Name="SOURCES" />
+          <DeployFilesVar />
+          <ResourcesVar Sync="true" Name="RESOURCES" />
+          <OthersVar />
+          <GacRefVar />
+          <AsmRefVar />
+          <ProjectRefVar />
+        </MonoDevelop.Autotools.MakefileInfo>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Folder Include="OsxIntegration.Ige\" />
+  </ItemGroup>
+</Project>
diff --git a/src/Backends/Banshee.Osx/Makefile.am b/src/Backends/Banshee.Osx/Makefile.am
index 5d806b5..3452d17 100644
--- a/src/Backends/Banshee.Osx/Makefile.am
+++ b/src/Backends/Banshee.Osx/Makefile.am
@@ -1,15 +1,22 @@
 ASSEMBLY = Banshee.Osx
+ASSEMBLY_BUILD_FLAGS = -unsafe
 TARGET = library
 LINK = $(REF_BACKEND_OSX)
 INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
 
 SOURCES =  \
+	Banshee.OsxBackend/HardwareManager.cs \
 	Banshee.OsxBackend/OsxService.cs \
-	Banshee.OsxBackend/HardwareManager.cs 
+	OsxIntegration.Framework/AppleEvent.cs \
+	OsxIntegration.Framework/ApplicationEvents.cs \
+	OsxIntegration.Framework/Carbon.cs \
+	OsxIntegration.Framework/CoreFoundation.cs \
+	OsxIntegration.Framework/HIToolbox.cs \
+	OsxIntegration.Framework/NavDialog.cs \
+	OsxIntegration.Ige/IgeMacMenu.cs \
+	OsxIntegration.Ige/IgeMacMenuGroup.cs 
 
-RESOURCES =  \
-	Banshee.Osx.addin.xml \
-	Resources/osx-ui-actions-layout.xml
+RESOURCES = Banshee.Osx.addin.xml
 
 if ENABLE_OSX
 include $(top_srcdir)/build/build.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]