GNOME.org
 

[f-spot] [xbuild] the system is finally on xbuild now.

commit 33e2b7b9b1207e52252c245f096265dfed60ef1a
Author: Stephen Shaw <sshaw decriptor com>
Date:   Sat Jun 30 13:44:41 2012 -0600

    [xbuild] the system is finally on xbuild now.
    
    There is probably still a bunch of stuff that needs
    to be cleaned up in the long run, f-spot is now
    building and putting all of the files where they are
    supposed to get.  An exact match to what it was before,
    except for gkeyfile, but it wasn't being used anyways

 autogen.sh                                         |    9 +++++----
 src/Clients/MainApp/MainApp.csproj                 |   17 +++++++++--------
 src/Core/FSpot.Bling/FSpot.Bling.csproj            |    1 +
 src/Core/FSpot.Gui/FSpot.Gui.csproj                |    1 +
 src/Core/FSpot.Utils/FSpot.Utils.csproj            |    1 +
 .../FSpot.Exporters.CD/FSpot.Exporters.CD.csproj   |    1 +
 .../FSpot.Exporters.Facebook.csproj                |    1 +
 .../FSpot.Exporters.Flickr.csproj                  |    1 +
 .../FSpot.Exporters.Folder.csproj                  |    1 +
 .../FSpot.Exporters.Gallery.csproj                 |    1 +
 .../FSpot.Exporters.PicasaWeb.csproj               |    1 +
 .../FSpot.Exporters.SmugMug.csproj                 |    1 +
 .../FSpot.Exporters.Tabblo.csproj                  |    1 +
 .../FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj |    1 +
 .../FSpot.Tools.ChangePhotoPath.csproj             |    1 +
 .../FSpot.Tools.DevelopInUFRaw.csproj              |    1 +
 .../FSpot.Tools.LiveWebGallery.csproj              |    1 +
 .../FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj |    1 +
 .../FSpot.Tools.ScreensaverConfig.csproj           |    1 +
 19 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index e56a878..8caa159 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -92,7 +92,8 @@ fi
 
 run ./configure --enable-maintainer-mode $@
 
-#mkdir -p external
-#cp -f `pkg-config --variable assemblies_dir gtk-sharp-beans-2.0`/* external
-#cp -f `pkg-config --variable assemblies_dir gio-sharp-2.0`/* external
-#rm -f external/*.mdb
+# This is a hack to get around xamarin bug#4030
+mkdir -p bin
+cp -f `pkg-config --variable assemblies_dir gtk-sharp-beans-2.0`/* bin
+cp -f `pkg-config --variable assemblies_dir gio-sharp-2.0`/* bin
+rm -f bin/*.mdb
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 7c5d069..c2db1c0 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -395,14 +395,15 @@
     <None Include="f-spot.exe.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\..\external\gtk-sharp-beans.dll.config">
-      <Link>gtk-sharp-beans.dll.config</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\..\external\gio-sharp.dll.config">
-      <Link>gio-sharp.dll.config</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
+  <PropertyGroup>
+	  <!-- .config is a workaround for xamarin bug #4811 -->
+    <AllowedReferenceRelatedFileExtensions>
+		  $(AllowedReferenceRelatedFileExtensions);
+		  .dll.config;
+		  .exe.config;
+		  .config
+	  </AllowedReferenceRelatedFileExtensions>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/Core/FSpot.Bling/FSpot.Bling.csproj b/src/Core/FSpot.Bling/FSpot.Bling.csproj
index c654001..0cafe9a 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling.csproj
+++ b/src/Core/FSpot.Bling/FSpot.Bling.csproj
@@ -62,6 +62,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index 1bb3e53..0343425 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -91,6 +91,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Core/FSpot.Utils/FSpot.Utils.csproj b/src/Core/FSpot.Utils/FSpot.Utils.csproj
index c481377..9d653eb 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils.csproj
+++ b/src/Core/FSpot.Utils/FSpot.Utils.csproj
@@ -96,6 +96,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
index b41f85d..60555b6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
@@ -68,6 +68,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
index bc1f6f7..10b3fe2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
@@ -95,6 +95,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
index 1c345bf..081b057 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
@@ -69,6 +69,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
index 1faa6e0..4cbb192 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
@@ -106,6 +106,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
index f4e8472..0b2052a 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
@@ -82,6 +82,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
index bfe2303..917714d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
@@ -80,6 +80,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
index d90b1b2..4eac1aa 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
@@ -98,6 +98,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
index 3b791b7..414a6c2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
@@ -79,6 +79,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
index 92810e3..e1fbd67 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
@@ -91,6 +91,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
index 9e9c48b..51e7a7f 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
@@ -65,6 +65,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
index e384657..7c7083f 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
@@ -92,6 +92,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
index b653508..08246ce 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
@@ -86,6 +86,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
index 6d1012e..2289e71 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
@@ -100,6 +100,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
index 0771965..faeff19 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
@@ -62,6 +62,7 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
+      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]