Merge branch 'saudi/fix-os-bff-settings-block' into 'main'

Fix and simplify bff Settings block See merge request Sharpmake/sharpmake!546
ubisoft · Sep 4, 2024 · a711a6c · a711a6c
2 parents 3455e67 + b90d657
commit a711a6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/Sharpmake.Generators/FastBuild/Bff.Template.cs b/Sharpmake.Generators/FastBuild/Bff.Template.cs
@@ -58,8 +58,7 @@ public static class ConfigurationFile
 ";
 
                 public const string WinEnvironment =
-@"#if __WINDOWS__[envRemoveGuards]
-    #import TMP
+@"    #import TMP
     #import TEMP
     #import USERPROFILE
     .Environment =
@@ -71,31 +70,24 @@ public static class ConfigurationFile
         ""PATH=[fastBuildPATH]""
 [envAdditionalVariables]
     }
-#endif[envRemoveGuards]
 ";
 
                 public const string OsxEnvironment =
-@"#if __OSX__[envRemoveGuards]
-    #import TMPDIR
+@"    #import TMPDIR
     .Environment =
     {
         ""TMPDIR=$TMPDIR$"",
         ""PATH=[fastBuildPATH]""
 [envAdditionalVariables]
     }
-#endif[envRemoveGuards]
 ";
 
-                public const string OsxEnvironmentOnWindows =
-@"#if __OSX__[envRemoveGuards]
-    #import TMP
-    .Environment =
+                public const string LinuxEnvironment =
+@"    .Environment =
     {
-        ""TMPDIR=$TMP$"",
         ""PATH=[fastBuildPATH]""
 [envAdditionalVariables]
     }
-#endif[envRemoveGuards]
 ";
 
                 public static string MasmConfigNameSuffix = "Masm";

diff --git a/Sharpmake.Generators/FastBuild/MasterBff.cs b/Sharpmake.Generators/FastBuild/MasterBff.cs
@@ -641,23 +641,20 @@ private static void WriteMasterSettingsSection(FileGenerator masterBffGenerator,
 
             string envRemoveGuards = FileGeneratorUtilities.RemoveLineTag;
             string fastBuildEnvironments = string.Empty;
-            if (allDevEnv.Contains(DevEnv.xcode))
+
+            switch (Util.GetExecutingPlatform())
             {
-                // we'll keep the #if guards if we have other devenv in the file
-                if (allDevEnv.Count > 1)
-                {
-                    envRemoveGuards = string.Empty;
+                case Platform.win64:
                     fastBuildEnvironments += Bff.Template.ConfigurationFile.WinEnvironment;
-                }
-
-                if (Util.GetExecutingPlatform() == Platform.win64)
-                    fastBuildEnvironments += Bff.Template.ConfigurationFile.OsxEnvironmentOnWindows;
-                else
+                    break;
+                case Platform.mac:
                     fastBuildEnvironments += Bff.Template.ConfigurationFile.OsxEnvironment;
-            }
-            else
-            {
-                fastBuildEnvironments += Bff.Template.ConfigurationFile.WinEnvironment;
+                    break;
+                case Platform.linux:
+                    fastBuildEnvironments += Bff.Template.ConfigurationFile.LinuxEnvironment;
+                    break;
+                default:
+                    throw new NotImplementedException($"Environment variables bff config not implemented for platform {Util.GetExecutingPlatform()}");
             }
 
             string envAdditionalVariables = FileGeneratorUtilities.RemoveLineTag;