From 54335e2e3b304a55f984bed5a8f04ad22a2628a7 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 14 Nov 2020 17:17:29 -0500 Subject: [PATCH] xcode upgrade, adjust signing settings. --- {English.lproj => Base.lproj}/MainMenu.xib | 0 {English.lproj => Base.lproj}/NewTerminal.xib | 0 {English.lproj => Base.lproj}/TermConfig.xib | 0 {English.lproj => Base.lproj}/TermWindow.xib | 0 .../TitleBarView.xib | 0 TwoTerm.xcodeproj/project.pbxproj | 45 +++++++++++-------- {English.lproj => en.lproj}/InfoPlist.strings | 0 7 files changed, 26 insertions(+), 19 deletions(-) rename {English.lproj => Base.lproj}/MainMenu.xib (100%) rename {English.lproj => Base.lproj}/NewTerminal.xib (100%) rename {English.lproj => Base.lproj}/TermConfig.xib (100%) rename {English.lproj => Base.lproj}/TermWindow.xib (100%) rename {English.lproj => Base.lproj}/TitleBarView.xib (100%) rename {English.lproj => en.lproj}/InfoPlist.strings (100%) diff --git a/English.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib similarity index 100% rename from English.lproj/MainMenu.xib rename to Base.lproj/MainMenu.xib diff --git a/English.lproj/NewTerminal.xib b/Base.lproj/NewTerminal.xib similarity index 100% rename from English.lproj/NewTerminal.xib rename to Base.lproj/NewTerminal.xib diff --git a/English.lproj/TermConfig.xib b/Base.lproj/TermConfig.xib similarity index 100% rename from English.lproj/TermConfig.xib rename to Base.lproj/TermConfig.xib diff --git a/English.lproj/TermWindow.xib b/Base.lproj/TermWindow.xib similarity index 100% rename from English.lproj/TermWindow.xib rename to Base.lproj/TermWindow.xib diff --git a/English.lproj/TitleBarView.xib b/Base.lproj/TitleBarView.xib similarity index 100% rename from English.lproj/TitleBarView.xib rename to Base.lproj/TitleBarView.xib diff --git a/TwoTerm.xcodeproj/project.pbxproj b/TwoTerm.xcodeproj/project.pbxproj index e4174b7..b31023d 100644 --- a/TwoTerm.xcodeproj/project.pbxproj +++ b/TwoTerm.xcodeproj/project.pbxproj @@ -78,6 +78,8 @@ isa = PBXBuildRule; compilerSpec = "com.apple.build-tasks.copy-strings-file"; fileType = sourcecode.glsl; + inputFiles = ( + ); isEditable = 1; outputFiles = ( ); @@ -88,6 +90,8 @@ compilerSpec = com.apple.compilers.proxy.script; filePatterns = "*.mm.ragel"; fileType = pattern.proxy; + inputFiles = ( + ); isEditable = 1; outputFiles = ( "$(DERIVED_SOURCES_DIR)/$(INPUT_FILE_BASE)", @@ -109,10 +113,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; 256AC3D80F4B6AC300CF3369 /* TwoTermAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwoTermAppDelegate.h; sourceTree = ""; }; 256AC3D90F4B6AC300CF3369 /* TwoTermAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TwoTermAppDelegate.mm; sourceTree = ""; }; 256AC3F00F4B6AF500CF3369 /* TwoTerm_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TwoTerm_Prefix.pch; sourceTree = ""; }; @@ -164,10 +166,8 @@ B61D0D68125B8E06001C713B /* Defaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Defaults.m; sourceTree = ""; }; B61EF7C31481561E008C1891 /* titlebar-corner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titlebar-corner.png"; sourceTree = ""; }; B61EF7C41481561E008C1891 /* titlebar-middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titlebar-middle.png"; sourceTree = ""; }; - B61EF7C814815AF8008C1891 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NewTerminal.xib; sourceTree = ""; }; B61EF7CA14815E07008C1891 /* TitleBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TitleBarView.h; sourceTree = ""; }; B61EF7CB14815E07008C1891 /* TitleBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TitleBarView.m; sourceTree = ""; }; - B61EF7CE148163E7008C1891 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TitleBarView.xib; sourceTree = ""; }; B61EF7D41482FB6D008C1891 /* titlebar-center.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titlebar-center.png"; sourceTree = ""; }; B61EF7D51482FB6D008C1891 /* titlebar-left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titlebar-left.png"; sourceTree = ""; }; B61EF7D61482FB6D008C1891 /* titlebar-right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titlebar-right.png"; sourceTree = ""; }; @@ -177,17 +177,21 @@ B66412381480A070003BC8D3 /* EmulatorWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmulatorWindow.m; sourceTree = ""; }; B676063911DEAD3500D6B66C /* TermWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermWindowController.h; sourceTree = ""; }; B676063A11DEAD3500D6B66C /* TermWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TermWindowController.mm; sourceTree = ""; }; - B676064D11DEBAE300D6B66C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TermWindow.xib; sourceTree = ""; }; B67B3CE312B6FA040033AE07 /* a2-charset-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "a2-charset-40.png"; sourceTree = ""; }; B67B3CE412B6FA040033AE07 /* a2-charset-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "a2-charset-80.png"; sourceTree = ""; }; B6801BD812EB549300B22E9E /* vt100-charset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vt100-charset.png"; sourceTree = ""; }; B683F70E2049E7B000470B99 /* VT50.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VT50.h; sourceTree = ""; }; B683F70F2049E7B000470B99 /* VT50.mm.ragel */ = {isa = PBXFileReference; lastKnownFileType = text; path = VT50.mm.ragel; sourceTree = ""; }; B683F711204AE32900470B99 /* VT05.mm.ragel */ = {isa = PBXFileReference; lastKnownFileType = text; path = VT05.mm.ragel; sourceTree = ""; }; + B6887810235CD76A00407374 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + B6887811235CD76A00407374 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TermWindow.xib; sourceTree = ""; }; + B6887812235CD76A00407374 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NewTerminal.xib; sourceTree = ""; }; + B6887813235CD76B00407374 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TermConfig.xib; sourceTree = ""; }; + B6887814235CD76B00407374 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TitleBarView.xib; sourceTree = ""; }; + B6887815235CD77600407374 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; B68A37D621A9D45A004CBDE4 /* TwoTerm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = TwoTerm.entitlements; path = TwoTerm/TwoTerm.entitlements; sourceTree = ""; }; B68E632812FF909C00EAFF5F /* ExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleView.h; sourceTree = ""; }; B68E632912FF909C00EAFF5F /* ExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleView.m; sourceTree = ""; }; - B69D0FB9202799B10073CCB7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TermConfig.xib; sourceTree = ""; }; B69E32A820221C9E0086D7B1 /* ChildMonitor.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildMonitor.mm; sourceTree = ""; }; B69E32AA20221CCA0086D7B1 /* ChildMonitor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChildMonitor.h; sourceTree = ""; }; B6ACA2AB1E5C8BEC000E774B /* GNOConsole.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GNOConsole.mm; sourceTree = ""; }; @@ -478,10 +482,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1110; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = 583V9CR5RE; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.HardenedRuntime = { enabled = 1; @@ -492,11 +496,11 @@ }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TwoTerm" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( en, - English, + Base, ); mainGroup = 29B97314FDCFA39411CA2CEA /* 2Term */; projectDirPath = ""; @@ -609,7 +613,7 @@ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 089C165DFE840E0CC02AAC07 /* English */, + B6887815235CD77600407374 /* en */, ); name = InfoPlist.strings; sourceTree = ""; @@ -617,7 +621,7 @@ 1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - 1DDD58150DA1D0A300B32029 /* English */, + B6887810235CD76A00407374 /* Base */, ); name = MainMenu.xib; sourceTree = ""; @@ -625,7 +629,7 @@ B61EF7C714815AF8008C1891 /* NewTerminal.xib */ = { isa = PBXVariantGroup; children = ( - B61EF7C814815AF8008C1891 /* English */, + B6887812235CD76A00407374 /* Base */, ); name = NewTerminal.xib; sourceTree = ""; @@ -633,7 +637,7 @@ B61EF7CD148163E7008C1891 /* TitleBarView.xib */ = { isa = PBXVariantGroup; children = ( - B61EF7CE148163E7008C1891 /* English */, + B6887814235CD76B00407374 /* Base */, ); name = TitleBarView.xib; sourceTree = ""; @@ -641,7 +645,7 @@ B676065011DEBAE900D6B66C /* TermWindow.xib */ = { isa = PBXVariantGroup; children = ( - B676064D11DEBAE300D6B66C /* English */, + B6887811235CD76A00407374 /* Base */, ); name = TermWindow.xib; sourceTree = ""; @@ -649,7 +653,7 @@ B69D0FB8202799B10073CCB7 /* TermConfig.xib */ = { isa = PBXVariantGroup; children = ( - B69D0FB9202799B10073CCB7 /* English */, + B6887813235CD76B00407374 /* Base */, ); name = TermConfig.xib; sourceTree = ""; @@ -663,9 +667,11 @@ ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = 583V9CR5RE; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; @@ -676,6 +682,7 @@ INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = TwoTerm; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -685,10 +692,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 583V9CR5RE; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/English.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings similarity index 100% rename from English.lproj/InfoPlist.strings rename to en.lproj/InfoPlist.strings