Replace GeneratedPaths with GeneratedCompiledPaths

The new property only include the paths of generated items that need to be compiled, for example it excludes the C++ generated headers.
zeroc-ice · Jan 18, 2021 · a0b5354 · a0b5354
1 parent 826b11c
commit a0b5354
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/Tasks.cs b/Tasks.cs
@@ -669,7 +669,7 @@ public ITaskItem[] ComputedSources
         }
 
         [Output]
-        public string[] GeneratedPaths
+        public string[] GeneratedCompiledPaths
         {
             get;
             private set;
@@ -682,6 +682,10 @@ protected abstract string ToolName
 
         abstract protected ITaskItem[] GeneratedItems(ITaskItem source);
 
+        // Same as generated items but only returns the generated items that need to be compiled
+        // for example it excludes C++ headers
+        protected abstract ITaskItem[] GeneratedCompiledItems(ITaskItem source);
+
         protected virtual string GetGeneratedPath(ITaskItem item, string outputDir, string ext)
         {
             return Path.Combine(outputDir,
@@ -718,7 +722,7 @@ public virtual Dictionary<string, string> GetOptions(ITaskItem item)
         public override bool Execute()
         {
             List<ITaskItem> computed = new List<ITaskItem>();
-            List<string> generatedPaths = new List<string>();
+            List<string> generatedCompiledPaths = new List<string>();
             foreach(ITaskItem source in Sources)
             {
                 bool skip = true;
@@ -737,7 +741,8 @@ public override bool Execute()
                 FileInfo generatedInfo = null;
                 FileInfo dependInfo = null;
 
-                generatedPaths.AddRange(generatedItems.Select(item => item.GetMetadata("FullPath")));
+                generatedCompiledPaths.AddRange(
+                    GeneratedCompiledItems(source).Select(item => item.GetMetadata("FullPath")));
                 //
                 // Check if the Slice compiler is older than the source file
                 //
@@ -932,7 +937,7 @@ public override bool Execute()
                     computed.Add(computedSource);
             }
             ComputedSources = computed.ToArray();
-            GeneratedPaths = generatedPaths.ToArray();
+            GeneratedCompiledPaths = generatedCompiledPaths.ToArray();
             return true;
         }
     }
@@ -990,6 +995,17 @@ protected override ITaskItem[] GeneratedItems(ITaskItem source)
                 new TaskItem(GetGeneratedPath(source, headerOutputDir, headerExt))
             };
         }
+
+        // Same as generated items but only returns the generated items that need to be compiled
+        // for example it excludes C++ headers
+        protected override ITaskItem[] GeneratedCompiledItems(ITaskItem source)
+        {
+            var generatedItems = GeneratedItems(source);
+            return new ITaskItem[]
+            {
+                generatedItems[0]
+            };
+        }
     }
 
     public class Slice2CSharpDependTask : SliceDependTask
@@ -1002,6 +1018,13 @@ protected override ITaskItem[] GeneratedItems(ITaskItem source)
             };
         }
 
+        // Same as generated items but only returns the generated items that need to be compiled
+        // for example it excludes C++ headers
+        protected override ITaskItem[] GeneratedCompiledItems(ITaskItem source)
+        {
+            return GeneratedItems(source);
+        }
+
         protected override string ToolName
         {
             get

diff --git a/msbuild/zeroc.icebuilder.msbuild.cpp.targets b/msbuild/zeroc.icebuilder.msbuild.cpp.targets
@@ -77,7 +77,7 @@
 
              <Output
                 PropertyName      = "_SliceCompileGeneratedPaths"
-                TaskParameter     = "GeneratedPaths"/>
+                TaskParameter     = "GeneratedCompiledPaths"/>
 
         </Slice2CppDependTask>
 

diff --git a/msbuild/zeroc.icebuilder.msbuild.csharp.targets b/msbuild/zeroc.icebuilder.msbuild.csharp.targets
@@ -71,7 +71,7 @@
 
             <Output
                 PropertyName      = "_SliceCompileGeneratedPaths"
-                TaskParameter     = "GeneratedPaths"/>
+                TaskParameter     = "GeneratedCompiledPaths"/>
 
         </Slice2CSharpDependTask>