[banshee] [build] Fix xbuild integration (bgo#597950)
- From: Alexander Kojevnikov <alexk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [build] Fix xbuild integration (bgo#597950)
- Date: Sun, 30 May 2010 00:39:44 +0000 (UTC)
commit 4b2f87adf80dc8b26f50ad385a1509d6d3b6fc93
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date: Sun May 30 10:35:04 2010 +1000
[build] Fix xbuild integration (bgo#597950)
Revised version of the original patch from Ankit Jain.
.gitignore | 1 +
Banshee.sln | 3 ---
src/Backends/Banshee.Osx/Banshee.Osx.csproj | 2 ++
.../Banshee.Core/Banshee.Collection/TrackInfo.cs | 2 +-
.../Banshee.NotificationArea.csproj | 1 +
.../Banshee.SqlDebugConsole.csproj | 5 +++++
.../Banshee.SqlDebugConsole/SqlActions.cs | 2 +-
src/Libraries/Hyena/Hyena.csproj | 6 +++++-
8 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53b5278..4b34e0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ C:\\NUnitPrimaryTrace.txt
tests/Performance/Performance.dll
tests/results/
extras/metrics/data
+obj
diff --git a/Banshee.sln b/Banshee.sln
index 09a3edf..24c10a6 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -385,9 +385,6 @@ Global
{FCC1AE87-E10B-4B47-8ADE-D5F447E48518}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCC1AE87-E10B-4B47-8ADE-D5F447E48518}.Windows|Any CPU.ActiveCfg = Windows|Any CPU
{FCC1AE87-E10B-4B47-8ADE-D5F447E48518}.Windows|Any CPU.Build.0 = Windows|Any CPU
- {6B781836-AB65-49EF-BECD-CCC193C5D589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B781836-AB65-49EF-BECD-CCC193C5D589}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6B781836-AB65-49EF-BECD-CCC193C5D589}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EB1FDF3F-048C-4010-80F5-D936A312580F} = {E6AD3714-5EA3-49D9-BA8D-12C69B2B8067}
diff --git a/src/Backends/Banshee.Osx/Banshee.Osx.csproj b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
index 0e024f1..5f76d6b 100644
--- a/src/Backends/Banshee.Osx/Banshee.Osx.csproj
+++ b/src/Backends/Banshee.Osx/Banshee.Osx.csproj
@@ -23,6 +23,7 @@
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
<OutputPath>..\..\..\bin</OutputPath>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -31,6 +32,7 @@
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
<OutputPath>..\..\..\bin</OutputPath>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
diff --git a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
index 89f828b..a2f3e91 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
@@ -521,7 +521,7 @@ namespace Banshee.Collection
value = ((TimeSpan)value).TotalSeconds;
} else if (value is DateTime) {
DateTime date = (DateTime)value;
- value = date == DateTime.MinValue ? 0l : DateTimeUtil.ToTimeT (date);
+ value = date == DateTime.MinValue ? 0L : DateTimeUtil.ToTimeT (date);
} else if (value is SafeUri) {
value = ((SafeUri)value).AbsoluteUri;
} else if (value is TrackMediaAttributes) {
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index 24d6030..fec93dd 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
@@ -23,6 +23,7 @@
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
<OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>INTERNAL_NOTIFY_SHARP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.csproj b/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.csproj
index 9b56a0b..3737212 100644
--- a/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.csproj
+++ b/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.csproj
@@ -41,6 +41,10 @@
<Project>{B28354F0-BA87-44E8-989F-B864A3C7C09F}</Project>
<Name>Banshee.Services</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\Core\Banshee.ThickClient\Banshee.ThickClient.csproj">
+ <Project>{AC839523-7BDF-4AB6-8115-E17921B96EC6}</Project>
+ <Name>Banshee.Core</Name>
+ </ProjectReference>
<ProjectReference Include="..\..\Libraries\Hyena\Hyena.csproj">
<Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
<Name>Hyena</Name>
@@ -48,6 +52,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
+ <Reference Include="gtk-sharp" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Banshee.SqlDebugConsole.addin.xml">
diff --git a/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs b/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs
index 33ba26a..2aee36a 100644
--- a/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs
+++ b/src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs
@@ -127,7 +127,7 @@ namespace Banshee.SqlDebugConsole
private void OnCommandExecuted (object o, CommandExecutedArgs args)
{
- Hyena.Log.DebugFormat ("in {0}ms executed {1}", args.Ms, args.SqlWithValues);
+ Hyena.Log.DebugFormat ("in {0}ms executed {1}", args.Ms, args.Sql);
}
private void UpdateActions ()
diff --git a/src/Libraries/Hyena/Hyena.csproj b/src/Libraries/Hyena/Hyena.csproj
index 49dceb5..7d37213 100644
--- a/src/Libraries/Hyena/Hyena.csproj
+++ b/src/Libraries/Hyena/Hyena.csproj
@@ -27,7 +27,7 @@
<WarningLevel>4</WarningLevel>
<Optimize>false</Optimize>
<OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>ENABLE_TESTS</DefineConstants>
+ <DefineConstants>ENABLE_TESTS NET_2_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -188,6 +188,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\nunit.core.dll</HintPath>
</Reference>
+ <Reference Include="nunit.framework">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\nunit.framework.dll</HintPath>
+ </Reference>
<Reference Include="Mono.Posix">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Mono.Posix.dll</HintPath>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]