r22180 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Oct  3 11:37:29 2017
New Revision: 22180

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22180
Log:
add Qt tools output files to msbuild Clean target

Modified:
    branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets

Modified: branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22180&path=/branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets	(original)
+++ branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets	Tue Oct  3 11:37:29 2017
@@ -44,12 +44,13 @@
     AssemblyName="Microsoft.Build.Tasks.v4.0">
     <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
   </UsingTask>
+  <!-- Targets for uic tool -->
   <Target
     Name="_uic"
     BeforeTargets="$(uicBeforeTargets)"
     AfterTargets="$(uicAfterTargets)"
     Condition="'@(uic)' != ''"
-    DependsOnTargets="$(uicDependsOn);ComputeuicOutput"
+    DependsOnTargets="$(uicDependsOn);ComputeUicOutput"
     Outputs="%(uic.Outputs)"
     Inputs="%(uic.Identity);%(uic.AdditionalDependencies);$(MSBuildProjectFile)">
     <ItemGroup
@@ -81,15 +82,15 @@
   <PropertyGroup>
     <ComputeLinkInputsTargets>
             $(ComputeLinkInputsTargets);
-            ComputeuicOutput;
+            ComputeUicOutput;
           </ComputeLinkInputsTargets>
     <ComputeLibInputsTargets>
             $(ComputeLibInputsTargets);
-            ComputeuicOutput;
+            ComputeUicOutput;
           </ComputeLibInputsTargets>
   </PropertyGroup>
   <Target
-    Name="ComputeuicOutput"
+    Name="ComputeUicOutput"
     Condition="'@(uic)' != ''">
     <ItemGroup>
       <uicDirsToMake
@@ -105,15 +106,30 @@
         Include="%(uicDirsToMake.Identity)"
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
     </ItemGroup>
-    <MakeDir
-      Directories="@(uicDirsToMake->'%(RootDir)%(Directory)')" />
-  </Target>
+    <MakeDir Directories="@(uicDirsToMake->'%(RootDir)%(Directory)')" />
+  </Target>
+  <!-- Clean support for uic tool -->
+  <PropertyGroup>
+    <CleanDependsOn>
+		UicClean;
+        $(CleanDependsOn);
+    </CleanDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="UicClean"
+    Condition="'@(uic)' != ''">
+    <ItemGroup>
+      <mocFileToDelete Include="%(uic.Outputs)" />
+    </ItemGroup>
+    <Delete Files="@(uicFileToDelete)" />
+  </Target>
+  <!-- Targets for moc tool -->
   <Target
     Name="_moc"
     BeforeTargets="$(mocBeforeTargets)"
     AfterTargets="$(mocAfterTargets)"
     Condition="'@(moc)' != ''"
-    DependsOnTargets="$(mocDependsOn);ComputemocOutput"
+    DependsOnTargets="$(mocDependsOn);ComputeMocOutput"
     Outputs="%(moc.Outputs)"
     Inputs="%(moc.Identity);%(moc.AdditionalDependencies);$(MSBuildProjectFile)">
     <ItemGroup
@@ -141,19 +157,22 @@
       CommandLineTemplate="%(moc.CommandLineTemplate)"
       AdditionalOptions="%(moc.AdditionalOptions)"
       Inputs="%(moc.Identity)" />
+    <ItemGroup>
+      <ClCompile Include="%(moc.Outputs)"/>
+    </ItemGroup>
   </Target>
   <PropertyGroup>
     <ComputeLinkInputsTargets>
             $(ComputeLinkInputsTargets);
-            ComputemocOutput;
+            ComputeMocOutput;
           </ComputeLinkInputsTargets>
     <ComputeLibInputsTargets>
             $(ComputeLibInputsTargets);
-            ComputemocOutput;
+            ComputeMocOutput;
           </ComputeLibInputsTargets>
   </PropertyGroup>
   <Target
-    Name="ComputemocOutput"
+    Name="ComputeMocOutput"
     Condition="'@(moc)' != ''">
     <ItemGroup>
       <mocDirsToMake
@@ -169,15 +188,30 @@
         Include="%(mocDirsToMake.Identity)"
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
     </ItemGroup>
-    <MakeDir
-      Directories="@(mocDirsToMake->'%(RootDir)%(Directory)')" />
-  </Target>
+    <MakeDir Directories="@(mocDirsToMake->'%(RootDir)%(Directory)')" />
+  </Target>
+  <!-- Clean support for moc output -->
+  <PropertyGroup>
+    <CleanDependsOn>
+		MocClean;
+        $(CleanDependsOn);
+    </CleanDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="MocClean"
+    Condition="'@(moc)' != ''">
+    <ItemGroup>
+      <mocFileToDelete Include="%(moc.Outputs)" />
+    </ItemGroup>
+    <Delete Files="@(mocFileToDelete)" />
+  </Target>
+  <!-- Targets for rcc tool -->
   <Target
     Name="_rcc"
     BeforeTargets="$(rccBeforeTargets)"
     AfterTargets="$(rccAfterTargets)"
     Condition="'@(rcc)' != ''"
-    DependsOnTargets="$(rccDependsOn);ComputerccOutput"
+    DependsOnTargets="$(rccDependsOn);ComputeRccOutput"
     Outputs="%(rcc.Outputs)"
     Inputs="%(rcc.Identity);%(rcc.AdditionalDependencies);$(MSBuildProjectFile)">
     <ItemGroup
@@ -209,15 +243,15 @@
   <PropertyGroup>
     <ComputeLinkInputsTargets>
             $(ComputeLinkInputsTargets);
-            ComputerccOutput;
+            ComputeRccOutput;
           </ComputeLinkInputsTargets>
     <ComputeLibInputsTargets>
             $(ComputeLibInputsTargets);
-            ComputerccOutput;
+            ComputeRccOutput;
           </ComputeLibInputsTargets>
   </PropertyGroup>
   <Target
-    Name="ComputerccOutput"
+    Name="ComputeRccOutput"
     Condition="'@(rcc)' != ''">
     <ItemGroup>
       <rccDirsToMake
@@ -233,15 +267,30 @@
         Include="%(rccDirsToMake.Identity)"
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
     </ItemGroup>
-    <MakeDir
-      Directories="@(rccDirsToMake->'%(RootDir)%(Directory)')" />
-  </Target>
+    <MakeDir Directories="@(rccDirsToMake->'%(RootDir)%(Directory)')" />
+  </Target>
+  <!-- Clean support for rcc output -->
+  <PropertyGroup>
+    <CleanDependsOn>
+		RccClean;
+        $(CleanDependsOn);
+    </CleanDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="RccClean"
+    Condition="'@(rcc)' != ''">
+    <ItemGroup>
+      <rccFileToDelete Include="%(rcc.Outputs)" />
+    </ItemGroup>
+    <Delete Files="@(rccFileToDelete)" />
+  </Target>
+   <!-- Targets for lrelease tool -->
   <Target
     Name="_lrelease"
     BeforeTargets="$(lreleaseBeforeTargets)"
     AfterTargets="$(lreleaseAfterTargets)"
     Condition="'@(lrelease)' != ''"
-    DependsOnTargets="$(lreleaseDependsOn);ComputelreleaseOutput"
+    DependsOnTargets="$(lreleaseDependsOn);ComputeLreleaseOutput"
     Outputs="%(lrelease.Outputs)"
     Inputs="%(lrelease.Identity);%(lrelease.AdditionalDependencies);$(MSBuildProjectFile)">
     <ItemGroup
@@ -273,15 +322,15 @@
   <PropertyGroup>
     <ComputeLinkInputsTargets>
             $(ComputeLinkInputsTargets);
-            ComputelreleaseOutput;
+            ComputeLreleaseOutput;
           </ComputeLinkInputsTargets>
     <ComputeLibInputsTargets>
             $(ComputeLibInputsTargets);
-            ComputelreleaseOutput;
+            ComputeLreleaseOutput;
           </ComputeLibInputsTargets>
   </PropertyGroup>
   <Target
-    Name="ComputelreleaseOutput"
+    Name="ComputeLreleaseOutput"
     Condition="'@(lrelease)' != ''">
     <ItemGroup>
       <lreleaseDirsToMake
@@ -297,7 +346,21 @@
         Include="%(lreleaseDirsToMake.Identity)"
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
     </ItemGroup>
-    <MakeDir
-      Directories="@(lreleaseDirsToMake->'%(RootDir)%(Directory)')" />
+    <MakeDir Directories="@(lreleaseDirsToMake->'%(RootDir)%(Directory)')" />
+  </Target>
+  <!-- Clean support for lrelease output -->
+  <PropertyGroup>
+    <CleanDependsOn>
+		LrelaseClean;
+        $(CleanDependsOn);
+    </CleanDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="LrelaseClean"
+    Condition="'@(lrelease)' != ''">
+    <ItemGroup>
+      <lreleaseFileToDelete Include="%(lrelease.Outputs)" />
+    </ItemGroup>
+    <Delete Files="@(lreleaseFileToDelete)" />
   </Target>
 </Project>