Merge pull request #307 from yonaskolb/always_create_phases

Always generate Sources build phase
This commit is contained in:
Yonas Kolb
2018-05-14 10:44:07 +10:00
committed by GitHub
3 changed files with 19 additions and 5 deletions
+2 -4
View File
@@ -549,10 +549,8 @@ public class PBXProjGenerator {
try target.prebuildScripts.forEach(generateBuildScript)
let sourcesBuildPhaseFiles = getBuildFilesForPhase(.sources)
if !sourcesBuildPhaseFiles.isEmpty {
let sourcesBuildPhase = createObject(id: target.name, PBXSourcesBuildPhase(files: sourcesBuildPhaseFiles))
buildPhases.append(sourcesBuildPhase.reference)
}
let sourcesBuildPhase = createObject(id: target.name, PBXSourcesBuildPhase(files: sourcesBuildPhaseFiles))
buildPhases.append(sourcesBuildPhase.reference)
let resourcesBuildPhaseFiles = getBuildFilesForPhase(.resources) + copyResourcesReferences
if !resourcesBuildPhaseFiles.isEmpty {
@@ -496,6 +496,7 @@
isa = PBXLegacyTarget;
buildConfigurationList = CL_479264660374 /* Build configuration list for PBXLegacyTarget "Legacy" */;
buildPhases = (
SBP_47926466037 /* Sources */,
);
buildToolPath = /usr/bin/true;
dependencies = (
@@ -529,6 +530,7 @@
isa = PBXNativeTarget;
buildConfigurationList = CL_324671077936 /* Build configuration list for PBXNativeTarget "App_watchOS" */;
buildPhases = (
SBP_32467107793 /* Sources */,
RBP_32467107793 /* Resources */,
CFBP_4684049960 /* CopyFiles */,
SSBP_5954948530 /* Carthage */,
@@ -911,6 +913,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
SBP_32467107793 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
SBP_43870453850 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -927,6 +936,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
SBP_47926466037 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
SBP_50702349225 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -281,7 +281,7 @@ func projectGeneratorTests() {
let pbxProject = try getPbxProj(scriptSpec)
guard let nativeTarget = pbxProject.objects.nativeTargets.referenceValues
.first(where: { !$0.buildPhases.isEmpty }) else {
.first(where: { $0.buildPhases.count >= 2 }) else {
throw failure("Target with build phases not found")
}
let buildPhases = nativeTarget.buildPhases