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
This commit is contained in:
Matt VanderKolk 2020-06-11 17:55:50 -07:00 коммит произвёл GitHub
Родитель 843fe41918
Коммит 187672671d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 40 добавлений и 33 удалений

Просмотреть файл

@ -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 */,

Просмотреть файл

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:libHttpClient.xcodeproj">
</FileRef>
</Workspace>

Просмотреть файл

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

Просмотреть файл

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
</plist>

Просмотреть файл

@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -51,8 +49,6 @@
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

Просмотреть файл

@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2C872C64221C91BD0054F791"
BuildableName = "HttpClient.framework"
BlueprintName = "libHttpClientFramework_mac"
BlueprintName = "libHttpClientFramework_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -47,12 +45,10 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2C872C64221C91BD0054F791"
BuildableName = "HttpClient.framework"
BlueprintName = "libHttpClientFramework_mac"
BlueprintName = "libHttpClientFramework_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@ -65,7 +61,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "2C872C64221C91BD0054F791"
BuildableName = "HttpClient.framework"
BlueprintName = "libHttpClientFramework_mac"
BlueprintName = "libHttpClientFramework_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>

Просмотреть файл

@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -51,8 +49,6 @@
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

Просмотреть файл

@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "7DB100A62119206B00AE22F5"
BuildableName = "libHttpClient.a"
BlueprintName = "libHttpClient_mac"
BlueprintName = "libHttpClient_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -47,12 +45,10 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "7DB100A62119206B00AE22F5"
BuildableName = "libHttpClient.a"
BlueprintName = "libHttpClient_mac"
BlueprintName = "libHttpClient_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@ -65,7 +61,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "7DB100A62119206B00AE22F5"
BuildableName = "libHttpClient.a"
BlueprintName = "libHttpClient_mac"
BlueprintName = "libHttpClient_macOS"
ReferencedContainer = "container:libHttpClient.xcodeproj">
</BuildableReference>
</MacroExpansion>