From 8a45121a6f8fe1f6f124c28f69862ead7310417b Mon Sep 17 00:00:00 2001 From: Alvar Hansen Date: Wed, 3 Jan 2018 13:43:08 +0200 Subject: [PATCH] Change default LD_RUNPATH_SEARCH_PATHS to string XCode will convert them to space separated string anyway. This way we avoid generating unnecessary difference in file. --- SettingPresets/Platforms/iOS.yml | 2 +- SettingPresets/Platforms/tvOS.yml | 2 +- SettingPresets/Products/bundle.ui-testing.yml | 2 +- SettingPresets/Products/bundle.unit-test.yml | 2 +- SettingPresets/Products/tv-app-extension.yml | 2 +- .../Products/watchkit2-extension.yml | 2 +- .../Project.xcodeproj/project.pbxproj | 150 ++++-------------- 7 files changed, 36 insertions(+), 126 deletions(-) diff --git a/SettingPresets/Platforms/iOS.yml b/SettingPresets/Platforms/iOS.yml index bb337dc8..088cbd64 100644 --- a/SettingPresets/Platforms/iOS.yml +++ b/SettingPresets/Platforms/iOS.yml @@ -1,3 +1,3 @@ -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" SDKROOT: iphoneos TARGETED_DEVICE_FAMILY: '1,2' diff --git a/SettingPresets/Platforms/tvOS.yml b/SettingPresets/Platforms/tvOS.yml index 26c99a9d..810ce3ab 100644 --- a/SettingPresets/Platforms/tvOS.yml +++ b/SettingPresets/Platforms/tvOS.yml @@ -1,3 +1,3 @@ TARGETED_DEVICE_FAMILY: 3 -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" SDKROOT: appletvos diff --git a/SettingPresets/Products/bundle.ui-testing.yml b/SettingPresets/Products/bundle.ui-testing.yml index d544579e..5b7271f2 100644 --- a/SettingPresets/Products/bundle.ui-testing.yml +++ b/SettingPresets/Products/bundle.ui-testing.yml @@ -1,2 +1,2 @@ BUNDLE_LOADER: $(TEST_HOST) -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks @loader_path/Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @loader_path/Frameworks" diff --git a/SettingPresets/Products/bundle.unit-test.yml b/SettingPresets/Products/bundle.unit-test.yml index d544579e..5b7271f2 100644 --- a/SettingPresets/Products/bundle.unit-test.yml +++ b/SettingPresets/Products/bundle.unit-test.yml @@ -1,2 +1,2 @@ BUNDLE_LOADER: $(TEST_HOST) -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks @loader_path/Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @loader_path/Frameworks" diff --git a/SettingPresets/Products/tv-app-extension.yml b/SettingPresets/Products/tv-app-extension.yml index b27996cb..72261c41 100644 --- a/SettingPresets/Products/tv-app-extension.yml +++ b/SettingPresets/Products/tv-app-extension.yml @@ -1,2 +1,2 @@ SKIP_INSTALL: 'YES' -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" diff --git a/SettingPresets/Products/watchkit2-extension.yml b/SettingPresets/Products/watchkit2-extension.yml index f77f27a5..cb41cd36 100644 --- a/SettingPresets/Products/watchkit2-extension.yml +++ b/SettingPresets/Products/watchkit2-extension.yml @@ -1,2 +1,2 @@ -LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"] +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" ASSETCATALOG_COMPILER_COMPLICATION_NAME: Complication diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index dfaeaa11..d2729a88 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -818,10 +818,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -831,10 +828,7 @@ BC_129177384103 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -850,10 +844,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -877,10 +868,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -899,10 +887,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -971,10 +956,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -997,10 +979,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1052,10 +1031,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -1081,10 +1057,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -1103,10 +1076,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1130,10 +1100,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1229,10 +1196,7 @@ BC_444705348320 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1242,10 +1206,7 @@ BC_467730755629 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1264,10 +1225,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1290,10 +1248,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1344,10 +1299,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -1369,10 +1321,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1395,10 +1344,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1442,10 +1388,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1519,10 +1462,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -1548,10 +1488,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-iOS"; PRODUCT_NAME = Framework; SDKROOT = iphoneos; @@ -1570,10 +1507,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1584,10 +1518,7 @@ BC_645651856160 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1610,10 +1541,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1819,10 +1747,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1845,10 +1770,7 @@ ); INFOPLIST_FILE = Framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.Framework-tvOS"; PRODUCT_NAME = Framework; SDKROOT = appletvos; @@ -1918,10 +1840,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = TestProjectTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks @loader_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project.App-iOS-Tests"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1932,10 +1851,7 @@ BC_799591451484 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1954,10 +1870,7 @@ ); INFOPLIST_FILE = App_iOS/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.project$(BUNDLE_ID_SUFFIX)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1967,10 +1880,7 @@ BC_805283956103 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.project.Legacy; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2";