GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create less diffs in pbxproj (#663)

Browse Source 
Create less diffs in pbxproj
This commit is contained in:
Yonas Kolb
2019-09-28 14:56:48 +10:00
committed by GitHub
parent c780ed3c2b 42b4820d07
commit 1bd4afff6e
16 changed files with 647 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -14,6 +14,7 @@
- Expand template variable in Array of Any [#651](https://github.com/yonaskolb/XcodeGen/pull/651) @kateinoigakukun
- Significantly improve performance when running with a large number files. [#658](https://github.com/yonaskolb/XcodeGen/pull/658) @kateinoigakukun
- Removed some more diffs between the generated .pbxproj and when Xcode resaves it [#663](https://github.com/yonaskolb/XcodeGen/pull/663) @yonaskolb
#### Internal
- Removed needless `Array` initialization. [#661](https://github.com/yonaskolb/XcodeGen/pull/661) @RomanPodymov
SettingPresets/Platforms/iOS.yml
+1 -1
View File
@@ -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'
SettingPresets/Platforms/macOS.yml
+1 -1
View File
@@ -1,3 +1,3 @@
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/../Frameworks"
LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/../Frameworks"]
SDKROOT: macosx
COMBINE_HIDPI_IMAGES: 'YES'
SettingPresets/Platforms/tvOS.yml
+1 -1
View File
@@ -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
SettingPresets/Product_Platform/bundle.unit-test_macOS.yml
+1 -1
View File
@@ -1 +1 @@
LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
LD_RUNPATH_SEARCH_PATHS: [$(inherited)", "@executable_path/../Frameworks", "@loader_path/../Frameworks]
SettingPresets/Products/app-extension.intents-service.yml
+1 -1
View File
@@ -1 +1 @@
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks @executable_path/../../../../Frameworks"
LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks", "@executable_path/../../../../Frameworks"]
SettingPresets/Products/app-extension.messages.yml
+1 -1
View File
@@ -1,2 +1,2 @@
ASSETCATALOG_COMPILER_APPICON_NAME: iMessage App Icon
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"
LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"]
SettingPresets/Products/app-extension.yml
+1 -1
View File
@@ -1 +1 @@
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"
LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks"]
SettingPresets/Products/bundle.ui-testing.yml
+1 -1
View File
@@ -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"]
SettingPresets/Products/bundle.unit-test.yml
+1 -1
View File
@@ -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"]
SettingPresets/Products/tv-app-extension.yml
+1 -1
View File
@@ -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"]
SettingPresets/Products/watchkit2-extension.yml
+1 -1
View File
@@ -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
Sources/XcodeGenKit/XCProjExtensions.swift
+12 -1
View File
@@ -46,6 +46,17 @@ extension Dictionary {
extension Xcode {
public static func fileType(path: Path) -> String? {
return path.extension.flatMap { Xcode.filetype(extension: $0) }
guard let fileExtension = path.extension else { return nil}
switch fileExtension {
// cases that aren't handled (yet) in XcodeProj.
// they can be removed once XcodeProj supports them
case "stringsdict": return "text.plist.stringsdict"
case "tbd": return "sourcecode.text-based-dylib-definition"
case "xpc": return "wrapper.xpc-service"
case "xcfilelist": return "text.xcfilelist"
default:
// fallback to XcodeProj defaults
return Xcode.filetype(extension: fileExtension)
}
}
}
Tests/Fixtures/CarthageProject/Project.xcodeproj/project.pbxproj
+24 -6
View File
@@ -429,7 +429,10 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@@ -474,7 +477,10 @@
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
@@ -519,7 +525,10 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@@ -601,7 +610,10 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@@ -624,7 +636,10 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = macosx;
SKIP_INSTALL = YES;
@@ -646,7 +661,10 @@
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = Framework;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
Tests/Fixtures/SPM/SPM.xcodeproj/project.pbxproj
+16 -4
View File
@@ -238,7 +238,10 @@
0CCC06807E5CD8361D899B7F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -248,7 +251,10 @@
1640ABF22E84A6AB9FFFB0D9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -261,7 +267,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = SPM/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@@ -277,7 +286,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = SPM/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
+583 -145
View File
File diff suppressed because it is too large Load Diff