From f5edb6ae711020a40d7213b067ea1c38837cf42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wei=C3=9F?= Date: Wed, 2 Oct 2019 16:47:02 +0200 Subject: [PATCH] Added unversioned TeamID infrastruture. This is described in detail in the file "Shared.xcconfig". --- .gitignore | 3 ++ Cog.xcodeproj/project.pbxproj | 17 +++++++-- .../General/General.xcodeproj/project.pbxproj | 22 +++++++++-- Xcode-config/Shared.xcconfig | 38 +++++++++++++++++++ 4 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 Xcode-config/Shared.xcconfig diff --git a/.gitignore b/.gitignore index e4cd55021..4dce217cd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ build # Special cog exceptions !Frameworks/OpenMPT/OpenMPT/build + +# User-specific xcconfig files +Xcode-config/DEVELOPMENT_TEAM.xcconfig diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 9588f6336..4bcda0c7f 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -927,6 +927,8 @@ 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* Cog_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cog_Prefix.pch; sourceTree = ""; }; + 3DDFC2462344EC6B000F1453 /* DEVELOPMENT_TEAM.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.xcconfig; sourceTree = ""; }; + 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; 5604D4590D60349B004F5C5D /* SpotlightWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpotlightWindowController.m; path = Spotlight/SpotlightWindowController.m; sourceTree = ""; }; 5604D45A0D60349B004F5C5D /* SpotlightWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpotlightWindowController.h; path = Spotlight/SpotlightWindowController.h; sourceTree = ""; }; 5604D4F40D60726E004F5C5D /* SpotlightPlaylistEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpotlightPlaylistEntry.h; path = Spotlight/SpotlightPlaylistEntry.h; sourceTree = ""; }; @@ -1513,6 +1515,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 17B619FF0B909ED400BC003F /* PlugIns */, + 3DDFC2452344EC6A000F1453 /* Xcode-config */, 19C28FACFE9D520D11CA2CBB /* Products */, ); name = Cog; @@ -1562,6 +1565,15 @@ name = Frameworks; sourceTree = ""; }; + 3DDFC2452344EC6A000F1453 /* Xcode-config */ = { + isa = PBXGroup; + children = ( + 3DDFC2462344EC6B000F1453 /* DEVELOPMENT_TEAM.xcconfig */, + 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */, + ); + path = "Xcode-config"; + sourceTree = ""; + }; 566D32170D538550004466A5 /* Products */ = { isa = PBXGroup; children = ( @@ -1947,7 +1959,6 @@ LastUpgradeCheck = 1100; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = 4S876G9VCD; ProvisioningStyle = Automatic; }; }; @@ -2826,7 +2837,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = 4S876G9VCD; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( ThirdParty/Frameworks, @@ -2866,7 +2876,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 4S876G9VCD; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( ThirdParty/Frameworks, @@ -2899,6 +2908,7 @@ }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -2939,6 +2949,7 @@ }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DDFC2472344EC6B000F1453 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj index 8b86fc611..1c1b41985 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/General/General.xcodeproj/project.pbxproj @@ -19,6 +19,8 @@ 17E41DB80C130AA500AC744D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17E41DB70C130AA500AC744D /* Localizable.strings */; }; 17E78A7E0D68BE3C005C5A59 /* file_tree.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E78A7D0D68BE3C005C5A59 /* file_tree.png */; }; 17E78B6A0D68C1E3005C5A59 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17E78B680D68C1E3005C5A59 /* Preferences.xib */; }; + 3DFAC490235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3DFAC48E235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig */; }; + 3DFAC491235B6B8100A29416 /* Shared.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */; }; 8372053718E3DEAF007EFAD4 /* ResamplerBehaviorArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8372053618E3DEAF007EFAD4 /* ResamplerBehaviorArrayController.m */; }; 837C0D401C50954000CAE18F /* MIDIPluginBehaviorArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837C0D3F1C50954000CAE18F /* MIDIPluginBehaviorArrayController.m */; }; 8384917718084D9F00E7332D /* appearance.png in Resources */ = {isa = PBXBuildFile; fileRef = 8384917518084D9F00E7332D /* appearance.png */; }; @@ -95,6 +97,8 @@ 17D1B3F60F6349CE00694C57 /* PreferencePanePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferencePanePlugin.h; path = ../PreferencePanePlugin.h; sourceTree = SOURCE_ROOT; }; 17E78A7D0D68BE3C005C5A59 /* file_tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_tree.png; path = Icons/file_tree.png; sourceTree = ""; }; 32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = ""; }; + 3DFAC48E235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.xcconfig; sourceTree = ""; }; + 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; 833F681B1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; 833F681C1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; 8347435D20E6D58800063D45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = ""; }; @@ -165,6 +169,7 @@ 32C88E010371C26100C91783 /* Other Sources */, 089C167CFE841241C02AAC07 /* Resources */, 089C1671FE841209C02AAC07 /* Frameworks and Libraries */, + 3DFAC48D235B6B8100A29416 /* Xcode-config */, 19C28FB8FE9D52D311CA2CBB /* Products */, ); name = General; @@ -279,6 +284,16 @@ name = "Other Sources"; sourceTree = ""; }; + 3DFAC48D235B6B8100A29416 /* Xcode-config */ = { + isa = PBXGroup; + children = ( + 3DFAC48E235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig */, + 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */, + ); + name = "Xcode-config"; + path = "../../Xcode-config"; + sourceTree = ""; + }; 838491801808588D00E7332D /* Products */ = { isa = PBXGroup; children = ( @@ -353,7 +368,6 @@ LastUpgradeCheck = 1020; TargetAttributes = { 8D5B49AC048680CD000E48DA = { - DevelopmentTeam = N6E749HJ2X; ProvisioningStyle = Automatic; }; }; @@ -409,6 +423,8 @@ 178E386E0C3DA64500EE6711 /* InfoPlist.strings in Resources */, 8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */, 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */, + 3DFAC491235B6B8100A29416 /* Shared.xcconfig in Resources */, + 3DFAC490235B6B8100A29416 /* DEVELOPMENT_TEAM.xcconfig in Resources */, 8384917818084D9F00E7332D /* growl.png in Resources */, 8E15A86C0B894768006DC802 /* updates.png in Resources */, 8384917718084D9F00E7332D /* appearance.png in Resources */, @@ -500,7 +516,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = ""; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -523,7 +538,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = General_Prefix.pch; @@ -539,6 +553,7 @@ }; 1DEB913F08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -584,6 +599,7 @@ }; 1DEB914008733D840010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DFAC48F235B6B8100A29416 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; diff --git a/Xcode-config/Shared.xcconfig b/Xcode-config/Shared.xcconfig new file mode 100644 index 000000000..37d0deebe --- /dev/null +++ b/Xcode-config/Shared.xcconfig @@ -0,0 +1,38 @@ +#include "DEVELOPMENT_TEAM.xcconfig" + +// Create the file DEVELOPMENT_TEAM.xcconfig +// in the "Xcode-config" directory within the project directory +// with the following build setting: +// DEVELOPMENT_TEAM = [Your TeamID] + +// Hint: recent Xcode versions appear to automatically create an empty file +// for you on the first build. This build will fail, or course, +// because code-signing can’t work without the DEVELOPMENT_TEAM set. +// Just fill it in and everything should work. + +// You can find your team ID by logging into your Apple Developer account +// and going to +// https://developer.apple.com/account/#/membership +// It should be listed under “Team ID”. + +// To set this system up for your own project, +// copy the "Xcode-config" directory there, +// add it to your Xcode project, +// navigate to your project settings +// (root icon in the Xcode Project Navigator) +// click on the project icon there, +// click on the “Info” tab +// under “Configurations” +// open the “Debug”, “Release”, +// and any other build configurations you might have. +// There you can set the pull-down menus in the +// “Based on Configuration File” column to “Shared”. +// Done. + +// Don’t forget to add the DEVELOPMENT_TEAM.xcconfig file to your .gitignore: +// # User-specific xcconfig files +// Xcode-config/DEVELOPMENT_TEAM.xcconfig + +// You can now remove the “DevelopmentTeam = AB1234C5DE;” entries from the +// .xcodeproj/project.pbxproj if you want to. +