[tasque/xbuild] [xbuild] Rewrote Dist and DistClean targets



commit f3b5f2210b6934ae6294989c1c3504b4634ac553
Author: Antonius Riha <antoniusriha gmail com>
Date:   Tue Sep 18 15:10:39 2012 +0200

    [xbuild] Rewrote Dist and  DistClean targets
    
    * Added target DistCheck

 build/Tasque.targets |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/build/Tasque.targets b/build/Tasque.targets
index 4bd041e..11e1739 100644
--- a/build/Tasque.targets
+++ b/build/Tasque.targets
@@ -173,24 +173,28 @@
   </Target>
   
   <!-- Dist -->
-  <Target Name="Dist">
-    <Message Text="DistDir=$(DistDir)" />
-    <Error Condition=" '$(DistDir)' == '' " Text="Property DistDir not set. Target Dist requires DistDir to be set." />
-    <CreateItem Include="*.csproj;@(TasqueCompile)">
-      <Output TaskParameter="Include" ItemName="DistFile" />
-    </CreateItem>
-    <Message Text="@(DistFile)" />
-    <Copy SourceFiles="$(SrcDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)" DestinationFiles="$(DistDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
+  <Target Name="Dist" DependsOnTargets="BeforeDist;_SetupDistFile;SetupDistFile;CoreDist;AfterDist" />
+  <Target Name="BeforeDist" />
+  <Target Name="AfterDist" />
+  <Target Name="CoreDist" DependsOnTargets="_CheckAbsDistDir;_GetSrcDirStrip">
+    <Copy Condition=" '@(DistFile)' != '' " SourceFiles="$(SrcDir)\%(DistFile.RelativeDir)%(FileName)%(Extension)"
+        DestinationFiles="$(AbsDistDir)\$(SrcDirStrip)\%(DistFile.RelativeDir)%(FileName)%(Extension)" SkipUnchangedFiles="true" />
   </Target>
   
+  <!-- DistCheck -->
+  <Target Name="DistCheck" />
+
+  <!-- Hook for consuming projects to register extra files for dist -->
+  <Target Name="SetupDistFile" />
+  
   <!-- Distclean -->
-  <Target Name="DistClean" DependsOnTargets="Clean">
-    <CreateItem Include="Makefile;*.csp">
-      <Output TaskParameter="Include" ItemName="DistCleanFile" />
-    </CreateItem>
-    <Delete Files="%(DistCleanFile.RelativeDir)%(FileName)%(Extension)" />
+  <Target Name="DistClean" DependsOnTargets="BeforeDistClean;CoreDistClean;AfterDistClean" />
+  <Target Name="BeforeDistClean" />
+  <Target Name="AfterDistClean" />
+  <Target Name="CoreDistClean" DependsOnTargets="Clean;_CheckAbsDistDir">
+    <Delete Files="$(AbsDistDir)\%(DistCleanFile.RelativeDir)%(FileName)%(Extension)" />
   </Target>
-   
+  
   <!-- Private -->
   <Target Name="_CheckProperties">
     <Error Condition=" '$(PackageName)' == '' " Text="PackageName is not set." />
@@ -220,6 +224,11 @@
     <Message Text="SrcDir=$(SrcDir)" />
   </Target>
   
+  <Target Name="_CheckAbsDistDir">
+    <Message Text="AbsDistDir=$(AbsDistDir)" />
+    <Error Condition=" '$(AbsDistDir)' == '' " Text="Property AbsDistDir not set. Target Dist requires AbsDistDir to be set." />
+  </Target>
+  
   <Target Name="_SetupBinInstallFile">
     <Message Text="$(TargetFileName)" />
     <CreateItem Include="$(TargetFileName)" AdditionalMetadata="InstallPath=$(PkgLibDir);InstallFileName=$(TargetFileName)">
@@ -261,4 +270,10 @@
     <Exec Command="$(UpdateIconCache) -f -t $(HiColorDir)" IgnoreExitCode="true" />
     <Exec Command="$(UpdateIconCache) -f -t $(PkgHiColorDir)" IgnoreExitCode="true" />
   </Target>
+  
+  <Target Name="_SetupDistFile">
+    <CreateItem Include="@(TasqueCompile);@(Icon);@(PkgIcon);@(PkgSound);@(GettextCompile);@(Translate);@(Substitute)">
+      <Output TaskParameter="Include" ItemName="DistFile" />
+    </CreateItem>
+  </Target>
 </Project>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]