[tasque/xbuild] [xbuild] Some more reorganisation

[Antonius Riha <antoniusri src gnome org>]

commit 55c04e1c3f05cd0578f9a2047d1223d937568306
Author: Antonius Riha <antoniusriha gmail com>
Date:   Mon Nov 19 12:13:20 2012 +0100

    [xbuild] Some more reorganisation

 build/X.Common.targets     |   48 +-------------------------------------------
 build/X.Substitute.targets |   32 ++++++++++++++++++++++++++++-
 build/X.Translate.targets  |   17 +++++++++++++++
 3 files changed, 49 insertions(+), 48 deletions(-)
---
diff --git a/build/X.Common.targets b/build/X.Common.targets
index 9c458ca..770b998 100644
--- a/build/X.Common.targets
+++ b/build/X.Common.targets
@@ -94,35 +94,6 @@
     <Message Text="SrcDir=$(SrcDir)" />
     <Message Text="PoBuildDir=$(PoBuildDir)" />
     <Message Text="PoSrcDir=$(PoSrcDir)" />
-    
-    <!-- Create subst items here -->
-    <CreateItem Include="@prefix@|$(Prefix)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@libdir@|$(LibDir)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@pkglibdir@|$(PkgLibDir)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@bindir@|$(BinDir)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@exec_prefix@|$(BinDir)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@datadir@|$(DataDir)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@wrapper@|$(Wrapper)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@version@|$(Version)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
-    <CreateItem Include="@PACKAGE@|$(PackageName)|text">
-      <Output TaskParameter="Include" ItemName="Substitution" />
-    </CreateItem>
   </Target>
   
   <Target Name="_SetupInSlnBuild">
@@ -174,23 +145,6 @@
     <Version Condition=" '$(Version)' == '' ">$(ReleaseVersion)</Version>
   </PropertyGroup>
   
-  <Choose>
-    <When Condition=" '$(OS)' == 'Windows_NT' ">
-      <PropertyGroup>
-        <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-merge.exe%22</IntlToolMerge>
-        <IntlToolUpdate Condition=" '$(IntlToolUpdate)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-update.exe%22</IntlToolUpdate>
-        <MsgFmt Condition=" '$(MsgFmt)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\msgfmt.exe%22</MsgFmt>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">intltool-merge</IntlToolMerge>
-        <IntlToolUpdate Condition=" '$(IntlToolUpdate)' == '' ">intltool-update</IntlToolUpdate>
-        <MsgFmt Condition=" '$(MsgFmt)' == '' ">msgfmt</MsgFmt>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  
   <!-- Main CSharp compile targets -->
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <UsingTask TaskName="Tasque.Build.Substitute" AssemblyFile="build.dll" />
@@ -315,7 +269,7 @@
   <Target Name="DistClean" DependsOnTargets="BeforeDistClean;CoreDistClean;AfterDistClean" />
   <Target Name="BeforeDistClean" />
   <Target Name="AfterDistClean" />
-  <Target Name="CoreDistClean" DependsOnTargets="Clean;_CheckAbsDistDir">
+  <Target Name="CoreDistClean" DependsOnTargets="Clean">
     <CreateItem Include="@(Compile)">
       <Output TaskParameter="Include" ItemName="DistCleanFile" />
     </CreateItem>
diff --git a/build/X.Substitute.targets b/build/X.Substitute.targets
index d27dc19..11c013e 100644
--- a/build/X.Substitute.targets
+++ b/build/X.Substitute.targets
@@ -1,5 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project InitialTargets="_SetupSubstitutions" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <Target Name="_SetupSubstitutions">
+    <CreateItem Include="@prefix@|$(Prefix)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@libdir@|$(LibDir)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@pkglibdir@|$(PkgLibDir)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@bindir@|$(BinDir)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@exec_prefix@|$(BinDir)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@datadir@|$(DataDir)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@wrapper@|$(Wrapper)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@version@|$(Version)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+    <CreateItem Include="@PACKAGE@|$(PackageName)|text">
+      <Output TaskParameter="Include" ItemName="Substitution" />
+    </CreateItem>
+  </Target>
+
   <Target Name="Substitute" DependsOnTargets="BeforeSubstitute;CoreSubstitute;AfterSubstitute" />
   <Target Name="BeforeSubstitute" />
   <Target Name="AfterSubstitute" />
diff --git a/build/X.Translate.targets b/build/X.Translate.targets
index 6f85ec0..f911e13 100644
--- a/build/X.Translate.targets
+++ b/build/X.Translate.targets
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <Choose>
+    <When Condition=" '$(OS)' == 'Windows_NT' ">
+      <PropertyGroup>
+        <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-merge.exe%22</IntlToolMerge>
+        <IntlToolUpdate Condition=" '$(IntlToolUpdate)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\intltool-update.exe%22</IntlToolUpdate>
+        <MsgFmt Condition=" '$(MsgFmt)' == '' ">%22$(MSBuildProgramFiles32)\GnuWin32\bin\msgfmt.exe%22</MsgFmt>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <IntlToolMerge Condition=" '$(IntlToolMerge)' == '' ">intltool-merge</IntlToolMerge>
+        <IntlToolUpdate Condition=" '$(IntlToolUpdate)' == '' ">intltool-update</IntlToolUpdate>
+        <MsgFmt Condition=" '$(MsgFmt)' == '' ">msgfmt</MsgFmt>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <Target Name="Translate" DependsOnTargets="BeforeTranslate;CoreTranslate;AfterTranslate" />
   <Target Name="BeforeTranslate" />
   <Target Name="AfterTranslate" />