Merge branch 'xcode-default-build-config' into 'main'

Add an option to set the default XCode build configuration from a sharpmake script See merge request Sharpmake/sharpmake!439
ubisoft · Sep 13, 2023 · 23e9294 · 23e9294
2 parents 490f9ea + d8e9b4e
commit 23e9294
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Sharpmake.Generators/Apple/XCodeProj.Template.cs b/Sharpmake.Generators/Apple/XCodeProj.Template.cs
@@ -520,15 +520,15 @@ private static class Template
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = ""[optimization]""
+      buildConfiguration = ""[DefaultTarget]""
       selectedDebuggerIdentifier = ""Xcode.DebuggerFoundation.Debugger.LLDB""
       selectedLauncherIdentifier = ""Xcode.DebuggerFoundation.Launcher.LLDB""
       shouldUseLaunchSchemeArgsEnv = ""YES"">
       <Testables>[testableElements]
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = ""[optimization]""
+      buildConfiguration = ""[DefaultTarget]""
       selectedDebuggerIdentifier = ""Xcode.DebuggerFoundation.Debugger.LLDB""
       selectedLauncherIdentifier = ""Xcode.DebuggerFoundation.Launcher.LLDB""
       launchStyle = ""0""
@@ -551,17 +551,17 @@ private static class Template
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = ""[optimization]""
+      buildConfiguration = ""[DefaultTarget]""
       shouldUseLaunchSchemeArgsEnv = ""YES""
       savedToolIdentifier = """"
       useCustomWorkingDirectory = ""NO""
       debugDocumentVersioning = ""YES"">
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration = ""[optimization]"">
+      buildConfiguration = ""[DefaultTarget]"">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = ""[optimization]""
+      buildConfiguration = ""[DefaultTarget]""
       revealArchiveInOrganizer = ""YES"">
    </ArchiveAction>
 </Scheme>

diff --git a/Sharpmake.Generators/Apple/XCodeProj.cs b/Sharpmake.Generators/Apple/XCodeProj.cs
@@ -287,11 +287,15 @@ string projectFile
                 Options.Option(Options.XCode.Scheme.MetalAPIValidation.Disable, () => options["MetalAPIValidation"] = "1")
             );
 
+            var defaultConfiguration = configurations.Where(conf => conf.UseAsDefaultForXCode == true).FirstOrDefault();
+            Project.Configuration activeConfiguration = defaultConfiguration != null ? defaultConfiguration : configurations[0];
+            string targetName = $"&quot;{activeConfiguration.Target.Name}&quot;";
+
             using (fileGenerator.Declare("projectFile", projectFile))
             using (fileGenerator.Declare("item", defaultTarget))
             using (fileGenerator.Declare("options", options))
             using (fileGenerator.Declare("testableElements", testableElements))
-            using (fileGenerator.Declare("optimization", configurations[0].Target.Name))
+            using (fileGenerator.Declare("DefaultTarget", targetName))
             {
                 fileGenerator.Write(Template.SchemeFileTemplate);
             }

diff --git a/Sharpmake/Project.Configuration.cs b/Sharpmake/Project.Configuration.cs
@@ -2348,6 +2348,10 @@ public string TargetFileExtension
                 set { }
             }
 
+            /// <summary>
+            /// Mark the configuration to be the default build configuration for XCode project
+            /// </summary>
+            public bool UseAsDefaultForXCode = false;
 
             // FastBuild configuration
             /// <summary>