From 5452b57dc9c062ad52a7ad7afdfc21a77bce1813 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Mon, 2 Aug 2010 13:11:33 +0200 Subject: [PATCH] [build] Fix up solution and csproj files Enable Makefile integration in the SparkleShare and NotifySharp projects, so that files are kept in sync in Makefile.am and the MonoDevelop project. --- FriendFace/FriendFace.csproj | 51 +++++++++++++++++++++++++++++++- NotifySharp/Makefile.am | 2 +- NotifySharp/NotifySharp.csproj | 39 +++++++++++++++++++----- SparkleShare.sln | 7 +---- SparkleShare/Makefile.am | 28 +++++++++--------- SparkleShare/SparkleShare.csproj | 37 +++++++++++++++++------ 6 files changed, 126 insertions(+), 38 deletions(-) diff --git a/FriendFace/FriendFace.csproj b/FriendFace/FriendFace.csproj index 522e24e6..6d63a00f 100644 --- a/FriendFace/FriendFace.csproj +++ b/FriendFace/FriendFace.csproj @@ -1 +1,50 @@ - Debug AnyCPU 8.0.50727 2.0 {3BA434AF-494F-4F5D-9D21-B7BD24FD67AF} Exe FriendFace FriendFace true full false bin\Debug DEBUG prompt 4 none false bin\Release prompt 4 \ No newline at end of file + + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {3BA434AF-494F-4F5D-9D21-B7BD24FD67AF} + Library + FriendFace + FriendFace + + + true + full + false + ..\bin + DEBUG + prompt + 4 + + + none + false + ..\bin + prompt + 4 + + + + gtk-sharp-2.0 + + + gtk-sharp-2.0 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NotifySharp/Makefile.am b/NotifySharp/Makefile.am index edc94265..c01305d6 100644 --- a/NotifySharp/Makefile.am +++ b/NotifySharp/Makefile.am @@ -4,7 +4,7 @@ TARGET = library LINK = $(REF_NOTIFY_SHARP) -SOURCES = \ +SOURCES = \ Global.cs \ Notification.cs diff --git a/NotifySharp/NotifySharp.csproj b/NotifySharp/NotifySharp.csproj index 4562b26f..f7301a81 100644 --- a/NotifySharp/NotifySharp.csproj +++ b/NotifySharp/NotifySharp.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug + ..\bin DEBUG prompt 4 @@ -22,7 +22,7 @@ none false - bin\Release + ..\bin prompt 4 @@ -31,11 +31,36 @@ - - - - - + + ndesk-dbus-1.0 + + + ndesk-dbus-glib-1.0 + + + gtk-sharp-2.0 + + + glib-sharp-2.0 + + + gtk-sharp-2.0 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SparkleShare.sln b/SparkleShare.sln index af6794fc..3d33d811 100644 --- a/SparkleShare.sln +++ b/SparkleShare.sln @@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShar EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\NotifySharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSSH", "SharpSSH\SharpSSH.csproj", "{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FriendFace", "FriendFace\FriendFace.csproj", "{3BA434AF-494F-4F5D-9D21-B7BD24FD67AF}" EndProject Global @@ -27,13 +25,10 @@ Global {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU - {BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = SparkleShare\SparkleShare.csproj + outputpath = bin name = SparkleShare EndGlobalSection EndGlobal diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index faebde1d..0bd4c5cd 100644 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -7,20 +7,20 @@ TARGET = exe LINK = $(REF_SPARKLESHARE) -SOURCES = \ -Defines.cs \ -SparkleBubble.cs \ -SparkleFetcher.cs \ -SparkleHelpers.cs \ -SparkleIntro.cs \ -SparklePaths.cs \ -SparklePlatform.cs \ -SparkleRepo.cs \ -SparkleShare.cs \ -SparkleSpinner.cs \ -SparkleStatusIcon.cs \ -SparkleUI.cs \ -SparkleWindow.cs +SOURCES = \ + Defines.cs \ + SparkleBubble.cs \ + SparkleFetcher.cs \ + SparkleHelpers.cs \ + SparkleIntro.cs \ + SparklePaths.cs \ + SparklePlatform.cs \ + SparkleRepo.cs \ + SparkleShare.cs \ + SparkleSpinner.cs \ + SparkleStatusIcon.cs \ + SparkleUI.cs \ + SparkleWindow.cs include $(top_srcdir)/build/build.mk diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj index 21cb32b2..abe5dc3a 100644 --- a/SparkleShare/SparkleShare.csproj +++ b/SparkleShare/SparkleShare.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug + ..\bin DEBUG prompt 4 @@ -22,21 +22,23 @@ none false - bin\Release + ..\bin prompt 4 - - - + + gtk-sharp-2.0 + + + gtk-sharp-2.0 + + + gtk-sharp-2.0 + - - False - ..\SharpSSH\lib\DiffieHellman.dll - @@ -51,6 +53,8 @@ + + @@ -58,4 +62,19 @@ NotifySharp + + + + + + + + + + + + + + +