[Csproj] Add support for texttemplates that use Host.SetFileExtension…

… instead of output extension tags.
ubisoft · Feb 10, 2022 · 8d18cd4 · 8d18cd4
1 parent f3e7be5
commit 8d18cd4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/Sharpmake.Generators/VisualStudio/Csproj.cs b/Sharpmake.Generators/VisualStudio/Csproj.cs
@@ -2170,7 +2170,7 @@ List<string> skipFiles
                 bool runtimeTemplate = project.AdditionalRuntimeTemplates.Contains(ttFile);
                 string expectedExtension =
                     runtimeTemplate ? ".cs" :
-                    Util.GetTextTemplateDirectiveParam(Path.Combine(_projectPath, ttFile), "output", "extension") ?? ".cs";
+                    Util.GetTextTemplateOutputExtension(Path.Combine(_projectPath, ttFile)) ?? ".cs";
                 if (!expectedExtension.StartsWith(".", StringComparison.Ordinal))
                     expectedExtension = "." + expectedExtension;
                 string fileNameWithoutExtension = ttFile.Substring(0, ttFile.Length - TTExtension.Length);

diff --git a/Sharpmake/Util.cs b/Sharpmake/Util.cs
@@ -98,6 +98,21 @@ public static int GetDeterministicHashCode(this string str)
             }
         }
 
+        private static string GetTextTemplateDirectiveParam(string[] templateText, string directive, string paramName)
+        {
+            Regex regex = new Regex(@"<#@\s*?" + directive + @"\s+?.*?" + paramName + @"=""(?<paramValue>.*?)"".*?#>");
+
+            foreach (var line in templateText)
+            {
+                Match m = regex.Match(line);
+                Group g = m.Groups["paramValue"];
+                if (g != null && g.Success)
+                    return g.Value;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Finds the first occurrence of directive and returns the 
         /// requested param value. Ex:
@@ -107,10 +122,29 @@ public static int GetDeterministicHashCode(this string str)
         /// and return ".txt"
         /// </summary>
         public static string GetTextTemplateDirectiveParam(string filePath, string directive, string paramName)
+        {
+            return GetTextTemplateDirectiveParam(File.ReadAllLines(filePath), directive, paramName);
+        }
+
+        /// <summary>
+        /// Finds the output type of a template, looking for both the directive form and the Host.SetFileExtension form
+        /// will match:
+        ///  <#@ output extension=".txt" #>
+        /// or
+        ///  Host.SetFileExtension(".txt")
+        /// and return ".txt"
+        /// </summary>
+		public static string GetTextTemplateOutputExtension(string filePath)
         {
             string[] templateText = File.ReadAllLines(filePath);
 
-            Regex regex = new Regex(@"<#@\s*?" + directive + @"\s+?.*?" + paramName + @"=""(?<paramValue>.*?)"".*?#>");
+            var output = Util.GetTextTemplateDirectiveParam(templateText, "output", "extension");
+            if (output != null)
+                return output;
+
+            // alternatively look for host.SetFileExtension
+
+            Regex regex = new Regex(@"Host.SetFileExtension\(""(?<paramValue>.*?)""\)");
 
             foreach (var line in templateText)
             {