[tasque/xbuild] [xbuild] Remove last residuals of GetSrcDirStrip task

[Antonius Riha <antoniusri src gnome org>]

commit 52cfef71f9b425aa6312e53901887d95962231e6
Author: Antonius Riha <antoniusriha gmail com>
Date:   Thu Oct 4 17:05:21 2012 +0200

    [xbuild] Remove last residuals of GetSrcDirStrip task
    
    + Add using NormalizePath task

 Makefile.am            |    1 -
 build/X.Common.targets |   15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a43c283..9712bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,6 @@ EXTRA_DIST = \
 	build/AssemblyInfo.cs \
 	build/Substitute.cs \
 	build/GetRelPath.cs \
-	build/GetSrcDirStrip.cs \
 	build/GetAbsSrcDir.cs \
 	build/X.Common.targets \
 	build/X.CSharp.targets \
diff --git a/build/X.Common.targets b/build/X.Common.targets
index e265448..78f1490 100644
--- a/build/X.Common.targets
+++ b/build/X.Common.targets
@@ -127,8 +127,8 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <UsingTask TaskName="Tasque.Build.Substitute" AssemblyFile="build.dll" />
   <UsingTask TaskName="Tasque.Build.GetRelPath" AssemblyFile="build.dll" />
-  <UsingTask TaskName="Tasque.Build.GetSrcDirStrip" AssemblyFile="build.dll" />
   <UsingTask TaskName="Tasque.Build.GetAbsSrcDir" AssemblyFile="build.dll" />
+  <UsingTask TaskName="Tasque.Build.NormalizePath" AssemblyFile="build.dll" />
 	
   <!-- Substitute -->
   <Target Name="Substitute" DependsOnTargets="BeforeSubstitute;CoreSubstitute;AfterSubstitute" />
@@ -269,9 +269,9 @@
   <Target Name="Dist" DependsOnTargets="BeforeDist;_SetupDistFile;SetupDistFile;CoreDist;AfterDist" />
   <Target Name="BeforeDist" />
   <Target Name="AfterDist" />
-  <Target Name="CoreDist" DependsOnTargets="_CheckAbsDistDir;_GetSrcDirStrip">
+  <Target Name="CoreDist" DependsOnTargets="_CheckAbsDistDir">
     <Copy Condition=" '@(DistFile)' != '' " SourceFiles="$(SrcDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)"
-        DestinationFiles="$(AbsDistDir)\$(SrcDirStrip)\%(DistFile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
+        DestinationFiles="$(AbsDistDir)\$(_SrcDirStrip)\%(DistFile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
   </Target>
   
   <!-- DistCheck -->
@@ -288,14 +288,7 @@
     <Delete Files="$(AbsDistDir)\%(DistCleanFile.RelativeDir)%(FileName)%(Extension)" />
   </Target>
   
-  <!-- Private -->
-  <Target Name="_GetSrcDirStrip">
-    <GetSrcDirStrip MSBuildProjectDir="$(MSBuildProjectDirectory)" AbsTopBuildDir="$(AbsTopBuildDir)">
-      <Output TaskParameter="SrcDirStrip" PropertyName="SrcDirStrip" />
-    </GetSrcDirStrip>
-    <Message Text="SrcDirStrip=$(SrcDirStrip)" />
-  </Target>
-  
+  <!-- Private -->  
   <Target Name="_CheckAbsDistDir">
     <Message Text="AbsDistDir=$(AbsDistDir)" />
     <Error Condition=" '$(AbsDistDir)' == '' " Text="Property AbsDistDir not set. Target Dist requires AbsDistDir to be set." />