GNOME.org
 

[tasque/xbuild] [xbuild] Rename Tasque.CSharp.targets to Tasque.targets

commit e415c04c95f46d49b7e8e71f777a05baa791353d
Author: Antonius Riha <antoniusriha gmail com>
Date:   Sat Sep 8 21:59:41 2012 +0200

    [xbuild] Rename Tasque.CSharp.targets to Tasque.targets
    
    ... and use it for data.mdproj and po.mdproj as well.

 build/{Tasque.CSharp.targets => Tasque.targets}    |    4 ++
 build/build.csproj                                 |    2 +-
 configure.ac                                       |    2 +-
 data/data.mdproj                                   |   41 ++++++++-----------
 po/po.mdproj                                       |    4 +-
 src/Addins/Backends/Dummy/DummyBackend.csproj      |    2 +-
 src/Addins/Backends/Eds/EdsBackend.csproj          |    2 +-
 .../Backends/Hiveminder/HiveminderBackend.csproj   |    2 +-
 src/Addins/Backends/IceCore/IceCoreBackend.csproj  |    2 +-
 src/Addins/Backends/Rtm/RtmBackend.csproj          |    2 +-
 src/Addins/Backends/Sqlite/SqliteBackend.csproj    |    2 +-
 src/Gtk.Tasque/Gtk.Tasque.csproj                   |    2 +-
 src/Libraries/RtmNet/RtmNet.csproj                 |    2 +-
 src/libtasque/libtasque.csproj                     |    2 +-
 src/tasque/tasque.csproj                           |    2 +-
 15 files changed, 34 insertions(+), 39 deletions(-)
---
diff --git a/build/Tasque.CSharp.targets b/build/Tasque.targets
similarity index 94%
rename from build/Tasque.CSharp.targets
rename to build/Tasque.targets
index 8097c30..20dcd0c 100644
--- a/build/Tasque.CSharp.targets
+++ b/build/Tasque.targets
@@ -5,6 +5,8 @@
     <OutputPath>.</OutputPath>
     <SrcDir Condition=" '$(SrcDir)' == '' ">.</SrcDir>
     <PkgLibDir Condition=" '$(PkgLibDir)' == '' ">$(Prefix)\lib\tasque</PkgLibDir>
+    <DataDir Condition=" '$(DataDir)' == '' ">$(Prefix)\share</DataDir>
+    <BinDir Condition=" '$(BinDir)' == '' ">$(Prefix)\bin</BinDir>
     <DestDir Condition=" '$(DestDir)' != '' And !HasTrailingSlash('$(DestDir)')">$(DestDir)\</DestDir>
     <BuildingSolutionFile>True</BuildingSolutionFile>
   </PropertyGroup>
@@ -16,6 +18,8 @@
     <Message Text="SrcDir=$(SrcDir)" />
     <Message Text="Prefix=$(Prefix)" />
     <Message Text="PkgLibDir=$(PkgLibDir)" />
+    <Message Text="DataDir=$(DataDir)" />
+    <Message Text="BinDir=$(BinDir)" />
     <Message Text="DestDir=$(DestDir)" />
     <Error Condition=" '$(Prefix)' == '' " Text="Prefix is not set." />
   </Target>
diff --git a/build/build.csproj b/build/build.csproj
index 69ce369..f792f54 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -74,7 +74,7 @@
     <None Include="..\data\data.mdproj">
       <Link>data.mdproj</Link>
     </None>
-    <None Include="Tasque.CSharp.targets" />
+    <None Include="Tasque.targets" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Addins\" />
diff --git a/configure.ac b/configure.ac
index 44b0d67..d2570d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,7 +336,7 @@ AC_SUBST(SQLITEBACKENDCSPROJ)
 
 AC_CONFIG_FILES([
 Makefile
-build/Tasque.CSharp.targets:build/Tasque.CSharp.targets
+build/Tasque.targets:build/Tasque.targets
 src/Makefile
 src/Libraries/RtmNet/Makefile
 src/Libraries/RtmNet/${RTMNETCSPROJ}:src/Libraries/RtmNet/RtmNet.csproj
diff --git a/data/data.mdproj b/data/data.mdproj
index 73bc71d..df24be9 100644
--- a/data/data.mdproj
+++ b/data/data.mdproj
@@ -8,34 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F2F4BAA-3C60-464D-B757-9DD18FED0BAA}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Linux' ">
-    <SrcDir Condition=" '$(SrcDir)' == '' ">.</SrcDir>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux|AnyCPU' ">
     <Prefix Condition=" '$(Prefix)' == '' ">..\build\bin</Prefix>
-    <DataDir Condition=" '$(DataDir)' == '' ">$(Prefix)\share</DataDir>
-    <BinDir Condition=" '$(BinDir)' == '' ">$(Prefix)\bin</BinDir>
     <DesktopDir Condition=" '$(DesktopDir)' == '' ">$(DataDir)\applications</DesktopDir>
     <DbusServiceDir Condition=" '$(DbusServiceDir)' == '' ">$(DataDir)\dbus-1\services</DbusServiceDir>
     <PixmapDir Condition=" '$(PixmapDir)' == '' ">$(DataDir)\pixmaps</PixmapDir>
     <HiColorDir Condition=" '$(HiColorDir)' == '' ">$(DataDir)\icons\hicolor</HiColorDir>
     <LocalHiColorDir Condition=" '$(LocalHiColorDir)' == '' ">$(DataDir)\tasque\icons\hicolor</LocalHiColorDir>
     <SoundsDir>$(DataDir)/tasque/sounds</SoundsDir>
-    <DestDir Condition=" '$(DestDir)' != '' And !HasTrailingSlash('$(DestDir)')">$(DestDir)\</DestDir>
     <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">intltool-merge</IntlToolMerge>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'MacOsx' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux|AnyCPU' ">
+    <DesktopFileName>tasque.desktop</DesktopFileName>
+    <DBusServiceFileName>org.gnome.Tasque.service</DBusServiceFileName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MacOsx|AnyCPU' ">
   </PropertyGroup>
-  <ItemGroup>
-    <DesktopInFile Include="tasque.desktop.in" />
-    <DbusServiceInFile Include="org.gnome.Tasque.service.in" />
-  </ItemGroup>
+  <Import Project="..\build\Tasque.targets" />
   <ItemGroup>
     <GlobalIcon Include="images\tasque-16.png">
       <Name>tasque.png</Name>
@@ -166,20 +155,24 @@
     <LocalSound Include="sounds\notify.wav" />
   </ItemGroup>
   <ItemGroup>
+    <DistFile Include="tasque.desktop.in" />
+    <DistFile Include="org.gnome.Tasque.service.in" />
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="images\" />
     <Folder Include="sounds\" />
   </ItemGroup>
   <!-- Linux targets -->
   <Target Name="LinuxBuild">
-    <Exec Command="LC_ALL=C $(IntlToolMerge) -d -u -c ..\po\.intltool-merge-cache $(SrcDir)\..\po $(SrcDir)\%(DesktopInFile.Identity) tasque.desktop" />
-    <Exec Command="sed -e %22s|%5C%40bindir%5C%40|$(BinDir)|g%22 -e %22s|%5C%40wrapper%5C%40|tasque|g%22 &lt; $(SrcDir)\%(DbusServiceInFile.Identity) &gt; org.gnome.Tasque.service" />
+    <Exec Command="LC_ALL=C $(IntlToolMerge) -d -u -c ..\po\.intltool-merge-cache $(SrcDir)\..\po $(SrcDir)\$(DesktopFileName).in $(DesktopFileName)" />
+    <Exec Command="sed -e %22s|%5C%40bindir%5C%40|$(BinDir)|g%22 -e %22s|%5C%40wrapper%5C%40|tasque|g%22 &lt; $(SrcDir)\$(DBusServiceFileName).in &gt; $(DBusServiceFileName)" />
   </Target>
   <Target Name="LinuxClean">
-    <Delete Files="%(DesktopInFile.FileName);%(DbusServiceInFile.FileName)" />
+    <Delete Files="$(DesktopFileName);$(DBusServiceFileName)" />
   </Target>
   <Target Name="LinuxInstall">
-    <Copy SourceFiles="%(DesktopInFile.FileName)" DestinationFiles="$(DestDir)$(DesktopDir)\%(DesktopInFile.FileName)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="%(DbusServiceInFile.FileName)" DestinationFiles="$(DestDir)$(DbusServiceDir)\%(DbusServiceInFile.FileName)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(DesktopFileName)" DestinationFiles="$(DestDir)$(DesktopDir)\$(DesktopFileName)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(DBusServiceFileName)" DestinationFiles="$(DestDir)$(DbusServiceDir)\$(DBusServiceFileName)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(SrcDir)\%(GlobalIcon.Identity)" DestinationFiles="$(DestDir)$(HiColorDir)\%(Size)\%(Context)\%(Name)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(SrcDir)\%(LocalIcon.Identity)" DestinationFiles="$(DestDir)$(LocalHiColorDir)\%(Size)\%(Context)\%(Name)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(SrcDir)\%(GlobalIcon.Identity)" DestinationFolder="$(DestDir)$(PixmapDir)" Condition="'%(Pixmaps)'" SkipUnchangedFiles="true" />
@@ -187,8 +180,8 @@
     <Copy SourceFiles="$(SrcDir)\%(LocalSound.Identity)" DestinationFolder="$(DestDir)$(SoundsDir)" />
   </Target>
   <Target Name="LinuxUninstall">
-    <Delete Files="$(DestDir)$(DesktopDir)\%(DesktopInFile.FileName)" />
-    <Delete Files="$(DestDir)$(DbusServiceDir)\%(DbusServiceInFile.FileName)" />
+    <Delete Files="$(DestDir)$(DesktopDir)\$(DesktopFileName)" />
+    <Delete Files="$(DestDir)$(DbusServiceDir)\$(DBusServiceFileName)" />
     <Delete Files="$(DestDir)$(HiColorDir)\%(GlobalIcon.Size)\%(Context)\%(Name)" />
     <Delete Files="$(DestDir)$(LocalHiColorDir)\%(LocalIcon.Size)\%(Context)\%(Name)" />
     <Delete Files="$(DestDir)$(PixmapDir)\%(GlobalIcon.FileName)%(Extension)" Condition="'%(Pixmaps)'" />
@@ -200,13 +193,13 @@
     <Exec Command="gtk-update-icon-cache -f -t $(LocalHiColorDir)" IgnoreExitCode="true" />
   </Target>
   <Target Name="Dist">
-    <CreateItem Include="data.mdproj;@(DesktopInFile);@(DbusServiceInFile);@(GlobalIcon);@(LocalIcon);@(LocalSound)">
+    <CreateItem Include="data.mdproj;$(DesktopFileName).in;$(DBusServiceFileName).in;@(GlobalIcon);@(LocalIcon);@(LocalSound)">
       <Output TaskParameter="Include" ItemName="DistFile" />
     </CreateItem>
     <Copy SourceFiles="$(SrcDir)\%(DistFile.Identity)" DestinationFiles="$(DistDir)\%(DistFile.Identity)" SkipUnchangedFiles="true" />
   </Target>
   <Target Name="DistClean" DependsOnTargets="Clean">
-    <CreateItem Include="Makefile;data.mdp;%(DesktopInFile.FileName);%(DbusServiceInFile.FileName)">
+    <CreateItem Include="Makefile;data.mdp;$(DesktopFileName);$(DBusServiceFileName)">
       <Output TaskParameter="Include" ItemName="DistCleanFile" />
     </CreateItem>
     <Delete Files="@(DistCleanFile)" />
diff --git a/po/po.mdproj b/po/po.mdproj
index fc69ab8..bcb3b36 100644
--- a/po/po.mdproj
+++ b/po/po.mdproj
@@ -61,11 +61,8 @@
   <!-- The above is only for the MD Gettext addin, which provides a convenient environment for translation -->
   <!-- Below are the xbuild instructions. New translations should be added to the GettextTranslation ItemGroup. -->
   <PropertyGroup>
-    <SrcDir Condition=" '$(SrcDir)' == '' ">.</SrcDir>
     <Prefix Condition=" '$(Prefix)' == '' ">..\build\bin</Prefix>
-    <DataDir Condition=" '$(DataDir)' == '' ">$(Prefix)\share</DataDir>
     <LocaleDir Condition=" '$(LocaleDir)' == '' ">$(DataDir)\locale</LocaleDir>
-    <DestDir Condition=" '$(DestDir)' != '' And !HasTrailingSlash('$(DestDir)')">$(DestDir)\</DestDir>
   </PropertyGroup>
   <PropertyGroup Condition="Exists('$(MSBuildProgramFiles32)\GnuWin32\bin\msgfmt.exe')">
     <MsgFmt>$(MSBuildProgramFiles32)\GnuWin32\bin\msgfmt.exe</MsgFmt>
@@ -73,6 +70,7 @@
   <PropertyGroup Condition="Exists('$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-update.exe')">
     <IntlToolUpdate>$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-update.exe</IntlToolUpdate>
   </PropertyGroup>
+  <Import Project="..\build\Tasque.targets" />
   <ItemGroup>
     <GettextTranslation Include="ca.po" />
     <GettextTranslation Include="ca valencia po" />
diff --git a/src/Addins/Backends/Dummy/DummyBackend.csproj b/src/Addins/Backends/Dummy/DummyBackend.csproj
index 4c1b7ca..377123b 100644
--- a/src/Addins/Backends/Dummy/DummyBackend.csproj
+++ b/src/Addins/Backends/Dummy/DummyBackend.csproj
@@ -25,7 +25,7 @@
     <Optimize>false</Optimize>
     <DefineConstants>DEBUG;TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
diff --git a/src/Addins/Backends/Eds/EdsBackend.csproj b/src/Addins/Backends/Eds/EdsBackend.csproj
index 3a0e187..aebec03 100644
--- a/src/Addins/Backends/Eds/EdsBackend.csproj
+++ b/src/Addins/Backends/Eds/EdsBackend.csproj
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
diff --git a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
index 9195de1..5594416 100644
--- a/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
+++ b/src/Addins/Backends/Hiveminder/HiveminderBackend.csproj
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
diff --git a/src/Addins/Backends/IceCore/IceCoreBackend.csproj b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
index 4521d0c..868487b 100644
--- a/src/Addins/Backends/IceCore/IceCoreBackend.csproj
+++ b/src/Addins/Backends/IceCore/IceCoreBackend.csproj
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
diff --git a/src/Addins/Backends/Rtm/RtmBackend.csproj b/src/Addins/Backends/Rtm/RtmBackend.csproj
index 9217ec8..def68ea 100644
--- a/src/Addins/Backends/Rtm/RtmBackend.csproj
+++ b/src/Addins/Backends/Rtm/RtmBackend.csproj
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
diff --git a/src/Addins/Backends/Sqlite/SqliteBackend.csproj b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
index 75f31ca..3704592 100644
--- a/src/Addins/Backends/Sqlite/SqliteBackend.csproj
+++ b/src/Addins/Backends/Sqlite/SqliteBackend.csproj
@@ -35,7 +35,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
diff --git a/src/Gtk.Tasque/Gtk.Tasque.csproj b/src/Gtk.Tasque/Gtk.Tasque.csproj
index 6aa1005..87b5c13 100644
--- a/src/Gtk.Tasque/Gtk.Tasque.csproj
+++ b/src/Gtk.Tasque/Gtk.Tasque.csproj
@@ -38,7 +38,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;WIN;$(GtkSharp12)</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/src/Libraries/RtmNet/RtmNet.csproj b/src/Libraries/RtmNet/RtmNet.csproj
index 6c9550b..2711479 100644
--- a/src/Libraries/RtmNet/RtmNet.csproj
+++ b/src/Libraries/RtmNet/RtmNet.csproj
@@ -24,7 +24,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/src/libtasque/libtasque.csproj b/src/libtasque/libtasque.csproj
index 4558ea7..eb7a256 100644
--- a/src/libtasque/libtasque.csproj
+++ b/src/libtasque/libtasque.csproj
@@ -24,7 +24,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Package>gtk-sharp-2.0</Package>
diff --git a/src/tasque/tasque.csproj b/src/tasque/tasque.csproj
index 98841cf..0cc53af 100644
--- a/src/tasque/tasque.csproj
+++ b/src/tasque/tasque.csproj
@@ -46,7 +46,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;OSX</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\..\build\Tasque.CSharp.targets" />
+  <Import Project="..\..\build\Tasque.targets" />
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]