yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-10-05 16:57:30 +03:00
Code Issues Projects Releases Wiki Activity

Add ability to specify "full" scheme actions with TargetScheme

Browse Source
This commit is contained in:
Brentley Jones 2020-04-13 12:09:31 -05:00
parent 276e9468ef
commit c23b81d8b5
5 changed files with 348 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Sources/ProjectSpec/TargetScheme.swift
View File

@ -3,6 +3,14 @@ import JSONUtilities
import XcodeProj
public struct TargetScheme: Equatable {
// Explicit action overrides. If these are specified they take precedence over generated actions.
public var build: Scheme.Build?
public var run: Scheme.Run?
public var test: Scheme.Test?
public var profile: Scheme.Profile?
public var analyze: Scheme.Analyze?
public var archive: Scheme.Archive?
public var testTargets: [Scheme.Test.TestTarget]
public var configVariants: [String]
public var gatherCoverageData: Bool?
@ -18,6 +26,12 @@ public struct TargetScheme: Equatable {
public var postActions: [Scheme.ExecutionAction]
public init(
build: Scheme.Build? = nil,
run: Scheme.Run? = nil,
test: Scheme.Test? = nil,
profile: Scheme.Profile? = nil,
analyze: Scheme.Analyze? = nil,
archive: Scheme.Archive? = nil,
testTargets: [Scheme.Test.TestTarget] = [],
configVariants: [String] = [],
gatherCoverageData: Bool? = nil,
@ -32,6 +46,12 @@ public struct TargetScheme: Equatable {
preActions: [Scheme.ExecutionAction] = [],
postActions: [Scheme.ExecutionAction] = []
) {
self.build = build
self.run = run
self.test = test
self.profile = profile
self.analyze = analyze
self.archive = archive
self.testTargets = testTargets
self.configVariants = configVariants
self.gatherCoverageData = gatherCoverageData
@ -51,6 +71,13 @@ public struct TargetScheme: Equatable {
extension TargetScheme: JSONObjectConvertible {
public init(jsonDictionary: JSONDictionary) throws {
build = jsonDictionary.json(atKeyPath: "build")
run = jsonDictionary.json(atKeyPath: "run")
test = jsonDictionary.json(atKeyPath: "test")
profile = jsonDictionary.json(atKeyPath: "profile")
analyze = jsonDictionary.json(atKeyPath: "analyze")
archive = jsonDictionary.json(atKeyPath: "archive")
if let targets = jsonDictionary["testTargets"] as? [Any] {
testTargets = try targets.compactMap { target in
if let string = target as? String {
@ -89,6 +116,25 @@ extension TargetScheme: JSONEncodable {
"preActions": preActions.map { $0.toJSONValue() },
"postActions": postActions.map { $0.toJSONValue() },
]
if let build = build {
dict["build"] = build.toJSONValue()
}
if let run = run {
dict["run"] = run.toJSONValue()
}
if let test = test {
dict["test"] = test.toJSONValue()
}
if let profile = profile {
dict["profile"] = profile.toJSONValue()
}
if let analyze = analyze {
dict["analyze"] = analyze.toJSONValue()
}
if let archive = archive {
dict["archive"] = archive.toJSONValue()
}
if let gatherCoverageData = gatherCoverageData {
dict["gatherCoverageData"] = gatherCoverageData

12
Sources/XcodeGenKit/SchemeGenerator.swift
View File

@ -312,14 +312,14 @@ extension Scheme {
public init(name: String, target: Target, targetScheme: TargetScheme, project: Project, debugConfig: String, releaseConfig: String) {
self.init(
name: name,
build: .init(
build: targetScheme.build ?? .init(
targets: Scheme.buildTargets(for: target, project: project),
parallelizeBuild: targetScheme.parallelizeBuild ?? Build.parallelizeBuildDefault,
buildImplicitDependencies: targetScheme.buildImplicitDependencies ?? Build.buildImplicitDependenciesDefault,
preActions: targetScheme.preActions,
postActions: targetScheme.postActions
),
run: .init(
run: targetScheme.run ?? .init(
config: debugConfig,
commandLineArguments: targetScheme.commandLineArguments,
environmentVariables: targetScheme.environmentVariables,
@ -328,7 +328,7 @@ extension Scheme {
language: targetScheme.language,
region: targetScheme.region
),
test: .init(
test: targetScheme.test ?? .init(
config: debugConfig,
gatherCoverageData: targetScheme.gatherCoverageData ?? Test.gatherCoverageDataDefault,
disableMainThreadChecker: targetScheme.disableMainThreadChecker ?? Test.disableMainThreadCheckerDefault,
@ -338,15 +338,15 @@ extension Scheme {
language: targetScheme.language,
region: targetScheme.region
),
profile: .init(
profile: targetScheme.profile ?? .init(
config: releaseConfig,
commandLineArguments: targetScheme.commandLineArguments,
environmentVariables: targetScheme.environmentVariables
),
analyze: .init(
analyze: targetScheme.analyze ?? .init(
config: debugConfig
),
archive: .init(
archive: targetScheme.archive ?? .init(
config: releaseConfig
)
)

128
Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
View File

@ -482,6 +482,7 @@
187E665975BB5611AF0F27E1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1BC32A813B80A53962A1F365 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1D0C79A8C750EC0DE748C463 /* StaticLibrary_ObjC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StaticLibrary_ObjC.m; sourceTree = "<group>"; };
216E85EF1AF0711CCC53C84F /* FullSchemeApp.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = FullSchemeApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
22237B8EBD9E6BE8EBC8735F /* XPC Service.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = "XPC Service.xpc"; sourceTree = BUILT_PRODUCTS_DIR; };
2233774B86539B1574D206B0 /* Framework2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Framework2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
28360ECA4D727FAA58557A81 /* example.mp4 */ = {isa = PBXFileReference; path = example.mp4; sourceTree = "<group>"; };
@ -926,6 +927,7 @@
2233774B86539B1574D206B0 /* Framework2.framework */,
A0DC40025AB59B688E758829 /* Framework2.framework */,
AB055761199DF36DB0C629A6 /* Framework2.framework */,
216E85EF1AF0711CCC53C84F /* FullSchemeApp.app */,
9A87A926D563773658FB87FE /* iMessageApp.app */,
D629E142AB87C681D4EC90F7 /* iMessageExtension.appex */,
C53ACB2962FED621389C36A2 /* iMessageStickersExtension.appex */,
@ -1581,6 +1583,21 @@
productReference = 22237B8EBD9E6BE8EBC8735F /* XPC Service.xpc */;
productType = "com.apple.product-type.xpc-service";
};
E8B6606CD473C6A434CE5207 /* FullSchemeApp */ = {
isa = PBXNativeTarget;
buildConfigurationList = 6D086C56F0E1E7EE76F0F568 /* Build configuration list for PBXNativeTarget "FullSchemeApp" */;
buildPhases = (
2E52EE7B48FF024E3B119530 /* Sources */,
);
buildRules = (
);
dependencies = (
);
name = FullSchemeApp;
productName = FullSchemeApp;
productReference = 216E85EF1AF0711CCC53C84F /* FullSchemeApp.app */;
productType = "com.apple.product-type.application";
};
F674B2CFC4738EEC49BAD0DA /* App_iOS_UITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 68CC35789B0DB020E2CFC517 /* Build configuration list for PBXNativeTarget "App_iOS_UITests" */;
@ -1674,6 +1691,7 @@
53A3B531E3947D8A8722745E /* Framework_macOS */,
536ACF18E4603B59207D43CE /* Framework_tvOS */,
71B5187E710718C1A205D4DC /* Framework_watchOS */,
E8B6606CD473C6A434CE5207 /* FullSchemeApp */,
72C923899DE05F1281872160 /* Legacy */,
13E8C5AB873CEE21E18E552F /* StaticLibrary_ObjC_iOS */,
578C80E461E675508CED5DC3 /* StaticLibrary_ObjC_macOS */,
@ -1994,6 +2012,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
2E52EE7B48FF024E3B119530 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
40A4456A24F99A01E340C032 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -2620,6 +2645,21 @@
};
name = "Staging Release";
};
0F571B1039588A8592DABB27 /* Test Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Test Debug";
};
10E250D1DC79E11058B933F9 /* Test Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -2790,6 +2830,21 @@
};
name = "Staging Release";
};
19527791129C46494575D2B0 /* Staging Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Staging Debug";
};
196FEEE6C4B0DDE53AD16BD6 /* Test Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -3118,6 +3173,21 @@
};
name = "Test Debug";
};
4052803333EAF29ABE344F12 /* Production Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Production Debug";
};
4089B74CA10172B8ED2D004B /* Staging Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -3210,6 +3280,21 @@
};
name = "Test Debug";
};
45BFFB3154AF1DE1E6CBDD86 /* Test Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Test Release";
};
4621C6C8A78FBB1CF4078178 /* Production Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -4176,6 +4261,21 @@
};
name = "Test Debug";
};
8F195EBE8CF35C79D1A35CE8 /* Staging Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Staging Release";
};
921EC740167F616C38809275 /* Production Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -4621,6 +4721,21 @@
};
name = "Test Release";
};
AE24525357169AC93A243002 /* Production Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.project.FullSchemeApp;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = "Production Release";
};
AE37A01B34B4B956E784082C /* Production Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -6140,6 +6255,19 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "Production Debug";
};
6D086C56F0E1E7EE76F0F568 /* Build configuration list for PBXNativeTarget "FullSchemeApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4052803333EAF29ABE344F12 /* Production Debug */,
AE24525357169AC93A243002 /* Production Release */,
19527791129C46494575D2B0 /* Staging Debug */,
8F195EBE8CF35C79D1A35CE8 /* Staging Release */,
0F571B1039588A8592DABB27 /* Test Debug */,
45BFFB3154AF1DE1E6CBDD86 /* Test Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "Production Debug";
};
752BB3C1A601770BDD9AC01E /* Build configuration list for PBXNativeTarget "StaticLibrary_ObjC_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (

136
Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/FullSchemeApp.xcscheme Normal file
View File

@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<PreActions>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "echo Starting Build">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8B6606CD473C6A434CE5207"
BuildableName = "FullSchemeApp.app"
BlueprintName = "FullSchemeApp"
ReferencedContainer = "container:Project.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PreActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8B6606CD473C6A434CE5207"
BuildableName = "FullSchemeApp.app"
BlueprintName = "FullSchemeApp"
ReferencedContainer = "container:Project.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Production Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = "ja"
region = "en"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "NO"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8B6606CD473C6A434CE5207"
BuildableName = "FullSchemeApp.app"
BlueprintName = "FullSchemeApp"
ReferencedContainer = "container:Project.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
</CommandLineArguments>
</TestAction>
<LaunchAction
buildConfiguration = "Production Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8B6606CD473C6A434CE5207"
BuildableName = "FullSchemeApp.app"
BlueprintName = "FullSchemeApp"
ReferencedContainer = "container:Project.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "argument"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "argument.with.dot"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Production Release"
shouldUseLaunchSchemeArgsEnv = "NO"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E8B6606CD473C6A434CE5207"
BuildableName = "FullSchemeApp.app"
BlueprintName = "FullSchemeApp"
ReferencedContainer = "container:Project.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "OTHER_VAR"
value = "YES"
isEnabled = "YES">
</EnvironmentVariable>
<EnvironmentVariable
key = "VAR"
value = "NO"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Production Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Production Release"
customArchiveName = "Custom"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

32
Tests/Fixtures/TestProject/project.yml
View File

@ -145,6 +145,33 @@ targets:
path: App_iOS/App.entitlements
properties:
com.apple.security.application-groups: group.com.app
FullSchemeApp:
type: application
platform: iOS
templates: [FullSchemeTemplate]
scheme:
build:
parallelizeBuild: false
buildImplicitDependencies: false
targets:
FullSchemeApp: all
preActions:
- script: echo Starting Build
settingsTarget: FullSchemeApp
run:
commandLineArguments:
argument: YES
argument.with.dot: YES
test:
gatherCoverageData: true
language: ja
region: en
profile:
environmentVariables:
VAR: NO
archive:
customArchiveName: Custom
App_watchOS:
type: application.watchapp2
@ -306,6 +333,11 @@ schemes:
targetTemplates:
MyTemplate:
scheme: {}
FullSchemeTemplate:
scheme:
profile:
environmentVariables:
OTHER_VAR: YES
schemeTemplates:
TestScheme: