From 6ec9e94a39c6ba46e2edc9904ce7540f3e5a7a65 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 22 Dec 2018 18:16:43 +0530 Subject: [PATCH] Xcode: Rename iOS targets to include an 'iOS' suffix But keep the PRODUCT_NAME as 'WireGuard', not 'WireGuardiOS'. --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index bf7b2ff..8ff437f 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -29,7 +29,7 @@ 6F5A2B4621AFDED40081EDD8 /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */; }; 6F5A2B4821AFF49A0081EDD8 /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */; }; 6F5D0C1D218352EF000F85AD /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5D0C1C218352EF000F85AD /* PacketTunnelProvider.swift */; }; - 6F5D0C22218352EF000F85AD /* WireGuardNetworkExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 6F5D0C22218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 6F61F1E921B932F700483816 /* WireGuardAppError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F61F1E821B932F700483816 /* WireGuardAppError.swift */; }; 6F61F1EB21B937EF00483816 /* WireGuardResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F61F1EA21B937EF00483816 /* WireGuardResult.swift */; }; 6F628C3D217F09E9003482A3 /* TunnelViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F628C3C217F09E9003482A3 /* TunnelViewModel.swift */; }; @@ -105,7 +105,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 6F5D0C22218352EF000F85AD /* WireGuardNetworkExtension.appex in Embed App Extensions */, + 6F5D0C22218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex in Embed App Extensions */, ); name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -129,7 +129,7 @@ 5FF7B96421CC95FA00A7DD74 /* PeerConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerConfiguration.swift; sourceTree = ""; }; 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extension.swift"; sourceTree = ""; }; 6F5D0C1421832391000F85AD /* DNSResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = ""; }; - 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WireGuardNetworkExtensioniOS.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 6F5D0C1C218352EF000F85AD /* PacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketTunnelProvider.swift; sourceTree = ""; }; 6F5D0C1E218352EF000F85AD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6F5D0C1F218352EF000F85AD /* WireGuardNetworkExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuardNetworkExtension.entitlements; sourceTree = ""; }; @@ -176,7 +176,7 @@ 6FF3526B21C23F960008484E /* ringlogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringlogger.h; sourceTree = ""; }; 6FF3526C21C23F960008484E /* ringlogger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringlogger.c; sourceTree = ""; }; 6FF3526E21C23FA10008484E /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; - 6FF4AC14211EC46F002C96EB /* WireGuard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WireGuard.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 6FF4AC14211EC46F002C96EB /* WireGuardiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = WireGuardiOS.app; path = WireGuard.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6FF4AC1E211EC472002C96EB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 6FF4AC21211EC472002C96EB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 6FF4AC23211EC472002C96EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -394,8 +394,8 @@ 6FF4AC15211EC46F002C96EB /* Products */ = { isa = PBXGroup; children = ( - 6FF4AC14211EC46F002C96EB /* WireGuard.app */, - 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */, + 6FF4AC14211EC46F002C96EB /* WireGuardiOS.app */, + 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */, ); name = Products; sourceTree = ""; @@ -433,26 +433,26 @@ /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridge */ = { + 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridgeiOS */ = { isa = PBXLegacyTarget; buildArgumentsString = "$(ACTION)"; - buildConfigurationList = 6FDEF7E021846BC700D8FBF6 /* Build configuration list for PBXLegacyTarget "WireGuardGoBridge" */; + buildConfigurationList = 6FDEF7E021846BC700D8FBF6 /* Build configuration list for PBXLegacyTarget "WireGuardGoBridgeiOS" */; buildPhases = ( ); buildToolPath = /usr/bin/make; buildWorkingDirectory = "$(PROJECT_DIR)/../wireguard-go-bridge"; dependencies = ( ); - name = WireGuardGoBridge; + name = WireGuardGoBridgeiOS; passBuildSettingsInEnvironment = 1; productName = WireGuardGoBridge; }; /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtension */ = { + 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtensioniOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtension" */; + buildConfigurationList = 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensioniOS" */; buildPhases = ( 5F45417B21C0906F00994C13 /* Swiftlint */, 6F61F1EC21BA4D4700483816 /* Extract wireguard-go Version */, @@ -465,14 +465,14 @@ dependencies = ( 6FDEF7E221846C0000D8FBF6 /* PBXTargetDependency */, ); - name = WireGuardNetworkExtension; + name = WireGuardNetworkExtensioniOS; productName = WireGuardNetworkExtension; - productReference = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */; + productReference = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtensioniOS.appex */; productType = "com.apple.product-type.app-extension"; }; - 6FF4AC13211EC46F002C96EB /* WireGuard */ = { + 6FF4AC13211EC46F002C96EB /* WireGuardiOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 6FF4AC26211EC472002C96EB /* Build configuration list for PBXNativeTarget "WireGuard" */; + buildConfigurationList = 6FF4AC26211EC472002C96EB /* Build configuration list for PBXNativeTarget "WireGuardiOS" */; buildPhases = ( 5F784E5721CDF6DD00B8D9A0 /* Strip Trailing Whitespace */, 5F45417A21C0902400994C13 /* Swiftlint */, @@ -487,9 +487,9 @@ dependencies = ( 6F5D0C21218352EF000F85AD /* PBXTargetDependency */, ); - name = WireGuard; + name = WireGuardiOS; productName = WireGuard; - productReference = 6FF4AC14211EC46F002C96EB /* WireGuard.app */; + productReference = 6FF4AC14211EC46F002C96EB /* WireGuardiOS.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -536,9 +536,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 6FF4AC13211EC46F002C96EB /* WireGuard */, - 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtension */, - 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridge */, + 6FF4AC13211EC46F002C96EB /* WireGuardiOS */, + 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtensioniOS */, + 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridgeiOS */, ); }; /* End PBXProject section */ @@ -745,12 +745,12 @@ /* Begin PBXTargetDependency section */ 6F5D0C21218352EF000F85AD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtension */; + target = 6F5D0C19218352EF000F85AD /* WireGuardNetworkExtensioniOS */; targetProxy = 6F5D0C20218352EF000F85AD /* PBXContainerItemProxy */; }; 6FDEF7E221846C0000D8FBF6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridge */; + target = 6FDEF7DD21846BC100D8FBF6 /* WireGuardGoBridgeiOS */; targetProxy = 6FDEF7E121846C0000D8FBF6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -978,7 +978,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = WireGuard; SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h"; SWIFT_VERSION = 4.2; }; @@ -997,7 +997,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = WireGuard; SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h"; SWIFT_VERSION = 4.2; }; @@ -1006,7 +1006,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtension" */ = { + 6F5D0C25218352EF000F85AD /* Build configuration list for PBXNativeTarget "WireGuardNetworkExtensioniOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6F5D0C23218352EF000F85AD /* Debug */, @@ -1015,7 +1015,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6FDEF7E021846BC700D8FBF6 /* Build configuration list for PBXLegacyTarget "WireGuardGoBridge" */ = { + 6FDEF7E021846BC700D8FBF6 /* Build configuration list for PBXLegacyTarget "WireGuardGoBridgeiOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6FDEF7DE21846BC100D8FBF6 /* Debug */, @@ -1033,7 +1033,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6FF4AC26211EC472002C96EB /* Build configuration list for PBXNativeTarget "WireGuard" */ = { + 6FF4AC26211EC472002C96EB /* Build configuration list for PBXNativeTarget "WireGuardiOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 6FF4AC27211EC472002C96EB /* Debug */,