From 187672671d2b726755d4a71686bfdd2742f92b35 Mon Sep 17 00:00:00 2001 From: Matt VanderKolk Date: Thu, 11 Jun 2020 17:55:50 -0700 Subject: [PATCH] Adding Xcode workspace and moving schemes to be owned by workspace (#530) In order to have the schemes for libHttpClient's project not show up and clutter parenting workspaces, I'm adding a workspace next to the existing project and moving ownership of the schemes from the project to the new workspace. With this change I'm also renaming the existing *_mac targets and schemes to *_macOS to match more widely accepted convention. * Adding new workspace * Setting autocreate schemes to false * Moving libHttpClient schemes from project to workspace * Renaming *_mac schemes and targets to *_macOS --- .../libHttpClient.xcodeproj/project.pbxproj | 22 +++++++++---------- .../contents.xcworkspacedata | 7 ++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 +++++++ .../libHttpClientFramework_iOS.xcscheme | 4 ---- .../libHttpClientFramework_macOS.xcscheme} | 10 +++------ .../xcschemes/libHttpClient_iOS.xcscheme | 4 ---- .../xcschemes/libHttpClient_macOS.xcscheme} | 10 +++------ 8 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/contents.xcworkspacedata create mode 100644 Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename Build/libHttpClient.Apple.C/{libHttpClient.xcodeproj => libHttpClient.xcworkspace}/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme (96%) rename Build/libHttpClient.Apple.C/{libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClientFramework_mac.xcscheme => libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClientFramework_macOS.xcscheme} (90%) rename Build/libHttpClient.Apple.C/{libHttpClient.xcodeproj => libHttpClient.xcworkspace}/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme (96%) rename Build/libHttpClient.Apple.C/{libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClient_mac.xcscheme => libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClient_macOS.xcscheme} (91%) diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/project.pbxproj b/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/project.pbxproj index 2d3df5ee..f4bbfcad 100644 --- a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/project.pbxproj +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/project.pbxproj @@ -568,9 +568,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 2C872C64221C91BD0054F791 /* libHttpClientFramework_mac */ = { + 2C872C64221C91BD0054F791 /* libHttpClientFramework_macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2C872C6A221C91BD0054F791 /* Build configuration list for PBXNativeTarget "libHttpClientFramework_mac" */; + buildConfigurationList = 2C872C6A221C91BD0054F791 /* Build configuration list for PBXNativeTarget "libHttpClientFramework_macOS" */; buildPhases = ( 2C872C60221C91BD0054F791 /* Headers */, 2C872C61221C91BD0054F791 /* Sources */, @@ -582,7 +582,7 @@ dependencies = ( 2C872C6E221C91D90054F791 /* PBXTargetDependency */, ); - name = libHttpClientFramework_mac; + name = libHttpClientFramework_macOS; productName = libHttpClientFramework_mac; productReference = 2C872C65221C91BD0054F791 /* HttpClient.framework */; productType = "com.apple.product-type.framework"; @@ -641,9 +641,9 @@ productReference = 67EE817E2362599C00A5F3DE /* libSSL.a */; productType = "com.apple.product-type.library.static"; }; - 7DB100A62119206B00AE22F5 /* libHttpClient_mac */ = { + 7DB100A62119206B00AE22F5 /* libHttpClient_macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 7DB100AF2119206B00AE22F5 /* Build configuration list for PBXNativeTarget "libHttpClient_mac" */; + buildConfigurationList = 7DB100AF2119206B00AE22F5 /* Build configuration list for PBXNativeTarget "libHttpClient_macOS" */; buildPhases = ( 9CC0523A213776DB0009B69A /* Build openssl */, 7DB100A32119206B00AE22F5 /* Sources */, @@ -654,7 +654,7 @@ ); dependencies = ( ); - name = libHttpClient_mac; + name = libHttpClient_macOS; productName = libHttpClient_Macos; productReference = 7DB100A72119206B00AE22F5 /* libHttpClient.a */; productType = "com.apple.product-type.library.static"; @@ -698,9 +698,9 @@ targets = ( 67EE817D2362599C00A5F3DE /* SSL */, 58722D0D209AD61900B071F7 /* libHttpClient_iOS */, - 7DB100A62119206B00AE22F5 /* libHttpClient_mac */, + 7DB100A62119206B00AE22F5 /* libHttpClient_macOS */, 58BD256122123EF9008942EB /* libHttpClientFramework_iOS */, - 2C872C64221C91BD0054F791 /* libHttpClientFramework_mac */, + 2C872C64221C91BD0054F791 /* libHttpClientFramework_macOS */, ); }; /* End PBXProject section */ @@ -844,7 +844,7 @@ /* Begin PBXTargetDependency section */ 2C872C6E221C91D90054F791 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 7DB100A62119206B00AE22F5 /* libHttpClient_mac */; + target = 7DB100A62119206B00AE22F5 /* libHttpClient_macOS */; targetProxy = 2C872C6D221C91D90054F791 /* PBXContainerItemProxy */; }; 58BD259322136482008942EB /* PBXTargetDependency */ = { @@ -1240,7 +1240,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2C872C6A221C91BD0054F791 /* Build configuration list for PBXNativeTarget "libHttpClientFramework_mac" */ = { + 2C872C6A221C91BD0054F791 /* Build configuration list for PBXNativeTarget "libHttpClientFramework_macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2C872C6B221C91BD0054F791 /* Debug */, @@ -1285,7 +1285,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7DB100AF2119206B00AE22F5 /* Build configuration list for PBXNativeTarget "libHttpClient_mac" */ = { + 7DB100AF2119206B00AE22F5 /* Build configuration list for PBXNativeTarget "libHttpClient_macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 7DB100AD2119206B00AE22F5 /* Debug */, diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/contents.xcworkspacedata b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..a27260db --- /dev/null +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..08de0be8 --- /dev/null +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme similarity index 96% rename from Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme rename to Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme index 25d18a2c..74441093 100644 --- a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClientFramework_iOS.xcscheme @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme similarity index 96% rename from Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme rename to Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme index d02b33f7..73e2dccc 100644 --- a/Build/libHttpClient.Apple.C/libHttpClient.xcodeproj/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme +++ b/Build/libHttpClient.Apple.C/libHttpClient.xcworkspace/xcshareddata/xcschemes/libHttpClient_iOS.xcscheme @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - -