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

sort group files for APFS

Browse Source
This commit is contained in:
Yonas Kolb
2017-10-01 12:43:42 +02:00
parent 836fa4d3fd
commit 4c5401dd80
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
+6 -6
View File
@@ -74,8 +74,8 @@
G26536595301 /* TestProjectTests */ = {
isa = PBXGroup;
children = (
FR6877173101 /* TestProjectTests.swift */,
FR1345298503 /* Info.plist */,
FR6877173101 /* TestProjectTests.swift */,
);
name = TestProjectTests;
path = TestProjectTests;
@@ -84,9 +84,9 @@
G29934978701 /* MyFramework */ = {
isa = PBXGroup;
children = (
FR7740960501 /* MyFramework.h */,
FR7078510801 /* FrameworkFile.swift */,
FR1345298501 /* Info.plist */,
FR7740960501 /* MyFramework.h */,
);
name = MyFramework;
path = MyFramework;
@@ -95,10 +95,10 @@
G65232631501 /* TestProject */ = {
isa = PBXGroup;
children = (
FR6218091901 /* ViewController.swift */,
FR5980633301 /* Assets.xcassets */,
FR1332263601 /* AppDelegate.swift */,
FR5980633301 /* Assets.xcassets */,
FR1345298502 /* Info.plist */,
FR6218091901 /* ViewController.swift */,
VG6405436301 /* LaunchScreen.storyboard */,
VG1473702401 /* Main.storyboard */,
);
@@ -109,8 +109,8 @@
G83406189501 /* Configs */ = {
isa = PBXGroup;
children = (
FR6334256101 /* config.xcconfig */,
FR3546283901 /* base.xcconfig */,
FR6334256101 /* config.xcconfig */,
);
name = Configs;
path = Configs;
@@ -336,8 +336,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BF1744565901 /* ViewController.swift in Sources */,
BF1073850101 /* AppDelegate.swift in Sources */,
BF1744565901 /* ViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Sources/XcodeGenKit/PBXProjGenerator.swift
+15 -4
View File
@@ -457,9 +457,20 @@ public class PBXProjGenerator {
func getGroups(path: Path, depth: Int = 0) throws -> (filePaths: [Path], groups: [PBXGroup]) {
let excludedFiles: [String] = [".DS_Store"]
let directories = try path.children().filter { $0.isDirectory && $0.extension == nil && $0.extension != "lproj" }
let filePaths = try path.children().filter { $0.isFile || $0.extension != nil && $0.extension != "lproj" }.filter { !excludedFiles.contains($0.lastComponent) }
let localisedDirectories = try path.children().filter { $0.extension == "lproj" }
let directories = try path.children()
.filter { $0.isDirectory && $0.extension == nil && $0.extension != "lproj" }
.sorted { $0.lastComponent < $1.lastComponent }
let filePaths = try path.children()
.filter { $0.isFile || $0.extension != nil && $0.extension != "lproj" }
.filter { !excludedFiles.contains($0.lastComponent) }
.sorted { $0.lastComponent < $1.lastComponent }
let localisedDirectories = try path.children()
.filter { $0.extension == "lproj" }
.sorted { $0.lastComponent < $1.lastComponent }
var groupChildren: [String] = []
var allFilePaths: [Path] = filePaths
var groups: [PBXGroup] = []
@@ -477,7 +488,7 @@ public class PBXProjGenerator {
}
for localisedDirectory in localisedDirectories {
for path in try localisedDirectory.children() {
for path in try localisedDirectory.children().sorted { $0.lastComponent < $1.lastComponent } {
let filePath = "\(localisedDirectory.lastComponent)/\(path.lastComponent)"
let fileReference = PBXFileReference(reference: generateUUID(PBXFileReference.self, localisedDirectory.lastComponent), sourceTree: .group, name: localisedDirectory.lastComponentWithoutExtension, path: filePath)
addObject(fileReference)