Added SourceFilesExclude and Regex to Project.Configuration, it is no…

…w possible to use these properties to exclude files on a Configuration level Vcxprojec will now use ResolvedSourceFilesExclude instead of ResolveSourceFilesBuildExclude to determine if file should be added or not
ubisoft · Oct 3, 2018 · 18d6e23 · 18d6e23
1 parent b38b431
commit 18d6e23
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 1 deletion.
diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs
@@ -1092,7 +1092,7 @@ private void GenerateFilesSection(IVcxprojGenerationContext context, IFileGenera
                 bool addFile = false;
                 foreach (Project.Configuration conf in context.ProjectConfigurations)
                 {
-                    if (conf.ResolvedSourceFilesBuildExclude.Contains(projectFile.FileName) == false)
+                    if (conf.ResolvedSourceFilesExclude.Contains(projectFile.FileName) == false)
                     {
                         addFile = true;
                         break;

diff --git a/Sharpmake/Project.Configuration.cs b/Sharpmake/Project.Configuration.cs
@@ -293,6 +293,14 @@ public OutputType Output
 
             public Strings SourceFilesFiltersRegex = new Strings();
 
+            /// <summary>
+            /// Excluded file from project for this configuration
+            /// </summary>
+            public Strings SourceFilesExclude = new Strings();
+
+            public Strings SourceFilesExcludeRegex = new Strings();
+
+
             /// <summary>
             /// Sources file that match this regex will be compiled as C Files
             /// </summary>
@@ -972,6 +980,8 @@ public void GeneratorSetGeneratedInformation(string executableExtension, string
 
             public Strings ResolvedSourceFilesBuildExclude = new Strings();
 
+            public Strings ResolvedSourceFilesExclude = new Strings();
+
             public Strings ResolvedSourceFilesBlobExclude = new Strings();
 
             public Strings ResolvedSourceFilesWithCompileAsCOption = new Strings();

diff --git a/Sharpmake/Project.cs b/Sharpmake/Project.cs
@@ -787,8 +787,23 @@ internal virtual void ResolveSourceFiles(Builder builder)
                 if (conf.IsFastBuild && conf.FastBuildBlobbed)
                     fastBuildBlobs = true;
 
+                var confSourceFilesExcludeRegex = RegexCache.GetCachedRegexes(conf.SourceFilesExcludeRegex);
+
+                // Remove file that match conf.SourceFilesExcludeRegex
+                if (AddMatchFiles(RootPath, Util.PathGetRelative(RootPath, SourceFiles), SourceFiles, ref conf.SourceFilesExclude, confSourceFilesExcludeRegex))
+                    System.Diagnostics.Debugger.Break();
+                if (AddMatchFiles(RootPath, Util.PathGetRelative(RootPath, ResourceFiles), ResourceFiles, ref conf.SourceFilesExclude, confSourceFilesExcludeRegex))
+                    System.Diagnostics.Debugger.Break();
+                if (AddMatchFiles(RootPath, Util.PathGetRelative(RootPath, NatvisFiles), NatvisFiles, ref conf.SourceFilesExclude, confSourceFilesExcludeRegex))
+                    System.Diagnostics.Debugger.Break();
+
                 conf.ResolvedSourceFilesBuildExclude.AddRange(SourceFilesExclude);
 
+                //Add SourceFilesExclude also to ResolvedSourceFilesBuildExclude in case we end up needing file for
+                //another configuration that way it gets added but excluded from build in this config
+                conf.ResolvedSourceFilesBuildExclude.AddRange(conf.SourceFilesExclude);
+                conf.ResolvedSourceFilesExclude.AddRange(conf.SourceFilesExclude);
+
                 // add SourceFilesBuildExclude from the project
                 if (DebugBreaks.ShouldBreakOnSourcePath(DebugBreaks.Context.Resolving, ResolvedSourceFilesBuildExclude))
                     System.Diagnostics.Debugger.Break();
@@ -912,6 +927,7 @@ internal virtual void ResolveSourceFiles(Builder builder)
                             conf.ResolvedSourceFilesBuildExclude.Add(sourceFile);
                     }
                     Util.ResolvePath(SourceRootPath, ref conf.ResolvedSourceFilesBuildExclude);
+                    Util.ResolvePath(SourceRootPath, ref conf.ResolvedSourceFilesExclude);
                 }
             }
 

diff --git a/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj b/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj
@@ -488,14 +488,44 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\debug\moc_floatcosanglespinbox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\debug\moc_privatewidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="obj\win64\qt\release\moc_floatanglespinbox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\release\moc_floatcosanglespinbox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\release\moc_privatewidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="obj\win64\qt\retail\moc_floatanglespinbox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\retail\moc_floatcosanglespinbox.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\retail\moc_privatewidget.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Retail|x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj.filters b/samples/QTFileCustomBuild/reference/projects/qtfilecustombuild_vs2017_win64.vcxproj.filters
@@ -11,12 +11,30 @@
     <ClCompile Include="obj\win64\qt\debug\moc_floatanglespinbox.cpp">
       <Filter>projects\obj\win64\qt\debug</Filter>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\debug\moc_floatcosanglespinbox.cpp">
+      <Filter>projects\obj\win64\qt\debug</Filter>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\debug\moc_privatewidget.cpp">
+      <Filter>projects\obj\win64\qt\debug</Filter>
+    </ClCompile>
     <ClCompile Include="obj\win64\qt\release\moc_floatanglespinbox.cpp">
       <Filter>projects\obj\win64\qt\release</Filter>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\release\moc_floatcosanglespinbox.cpp">
+      <Filter>projects\obj\win64\qt\release</Filter>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\release\moc_privatewidget.cpp">
+      <Filter>projects\obj\win64\qt\release</Filter>
+    </ClCompile>
     <ClCompile Include="obj\win64\qt\retail\moc_floatanglespinbox.cpp">
       <Filter>projects\obj\win64\qt\retail</Filter>
     </ClCompile>
+    <ClCompile Include="obj\win64\qt\retail\moc_floatcosanglespinbox.cpp">
+      <Filter>projects\obj\win64\qt\retail</Filter>
+    </ClCompile>
+    <ClCompile Include="obj\win64\qt\retail\moc_privatewidget.cpp">
+      <Filter>projects\obj\win64\qt\retail</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\codebase\stdafx.h" />