Merge branch 'autoconvert-obsolete' into 'main'

Transform recent obsolete change with error in warning for now See merge request Sharpmake/sharpmake!463
ubisoft · Sep 27, 2023 · 538be41 · 538be41
2 parents 909c4a0 + 39f5b75
commit 538be41
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs
@@ -144,8 +144,13 @@ public void Generate(Builder builder, Project project, List<Project.Configuratio
             GenerateImpl(context, generatedFiles, skipFiles);
         }
 
-        [Obsolete("Deprecated. Use `FastBuildSettings.FastBuildCustomArguments` instead.", error: true)]
-        public static string FastBuildCustomArguments = "";
+        [Obsolete("Deprecated. Use `FastBuildSettings.FastBuildCustomArguments` instead.", error: false)]
+        public static string FastBuildCustomArguments
+        {
+            get { return FastBuildSettings.FastBuildCustomArguments; }
+            set { FastBuildSettings.FastBuildCustomArguments = value; }
+        }
+
         public const string ProjectExtension = ".vcxproj";
         private const string ProjectFilterExtension = ".filters";
         private const string CopyDependenciesExtension = "_runtimedependencies.txt";

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs
@@ -657,6 +657,16 @@ public virtual void SelectCompilerOptions(IGenerationContext context)
                 Options.Option(Options.XCode.Compiler.EnableBitcode.Enable, () => { options["EnableBitcode"] = "YES"; })
             );
 
+#pragma warning disable 618  // obsolete warning
+            // Convert options - Temporary measure
+            context.SelectOption(
+                Options.Option(Options.XCode.Compiler.Exceptions.Disable, () => { conf.Options.Add(Options.XCode.Compiler.CppExceptions.Disable); conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Disable); }),
+                Options.Option(Options.XCode.Compiler.Exceptions.Enable, () => { conf.Options.Add(Options.XCode.Compiler.CppExceptions.Enable); conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Enable); }),
+                Options.Option(Options.XCode.Compiler.Exceptions.EnableCpp, () => { conf.Options.Add(Options.XCode.Compiler.CppExceptions.Enable); conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Disable); }), 
+                Options.Option(Options.XCode.Compiler.Exceptions.EnableObjC, () => { conf.Options.Add(Options.XCode.Compiler.CppExceptions.Disable); conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Enable); }) 
+            );
+#pragma warning restore 618
+
             context.SelectOption(
                 Options.Option(Options.XCode.Compiler.CppExceptions.Disable, () => { options["CppExceptionHandling"] = "NO"; cmdLineOptions["CppExceptions"] = FileGeneratorUtilities.RemoveLineTag; }),
                 Options.Option(Options.XCode.Compiler.CppExceptions.Enable, () => { options["CppExceptionHandling"] = "YES"; cmdLineOptions["CppExceptions"] = "-fcxx-exceptions"; })

diff --git a/Sharpmake/Options.XCode.cs b/Sharpmake/Options.XCode.cs
@@ -233,7 +233,7 @@ public enum EnableBitcode
                     Disable
                 }
 
-                [Obsolete("Deprecated. Use `CppExceptions`, `ObjCExceptions`, or `ObjCARCExceptions` instead.", error: true)]
+                [Obsolete("Deprecated. Use `CppExceptions`, `ObjCExceptions`, or `ObjCARCExceptions` instead.", error: false)]
                 public enum Exceptions
                 {
                     [Default]