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

Merge pull request #254 from yonaskolb/should-use-cond

Browse Source 
Fix shouldUseLaunchSchemeArgsEnv disabling logic
This commit is contained in:
Yonas Kolb
2018-03-01 10:48:19 +11:00
committed by GitHub
parent 0ace2fd1fd 0a37fd54e3
commit d504f482c7
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/ProjectSpec/Scheme.swift
+8
View File
@@ -140,6 +140,10 @@ public struct Scheme: Equatable {
lhs.postActions == rhs.postActions &&
lhs.environmentVariables == rhs.environmentVariables
}
public var shouldUseLaunchSchemeArgsEnv: Bool {
return commandLineArguments.isEmpty && environmentVariables.isEmpty
}
}
public struct Analyze: BuildAction {
@@ -180,6 +184,10 @@ public struct Scheme: Equatable {
lhs.postActions == rhs.postActions &&
lhs.environmentVariables == rhs.environmentVariables
}
public var shouldUseLaunchSchemeArgsEnv: Bool {
return commandLineArguments.isEmpty && environmentVariables.isEmpty
}
}
public struct Archive: BuildAction {
Sources/XcodeGenKit/ProjectGenerator.swift
+2 -2
View File
@@ -100,7 +100,7 @@ public class ProjectGenerator {
testables: testables,
preActions: scheme.test?.preActions.map(getExecutionAction) ?? [],
postActions: scheme.test?.postActions.map(getExecutionAction) ?? [],
shouldUseLaunchSchemeArgsEnv: scheme.test?.commandLineArguments.isEmpty ?? true,
shouldUseLaunchSchemeArgsEnv: scheme.test?.shouldUseLaunchSchemeArgsEnv ?? true,
codeCoverageEnabled: scheme.test?.gatherCoverageData ?? false,
commandlineArguments: testCommandLineArgs,
environmentVariables: testVariables,
@@ -121,7 +121,7 @@ public class ProjectGenerator {
buildConfiguration: scheme.profile?.config ?? defaultReleaseConfig.name,
preActions: scheme.profile?.preActions.map(getExecutionAction) ?? [],
postActions: scheme.profile?.postActions.map(getExecutionAction) ?? [],
shouldUseLaunchSchemeArgsEnv: scheme.profile?.commandLineArguments.isEmpty ?? true,
shouldUseLaunchSchemeArgsEnv: scheme.profile?.shouldUseLaunchSchemeArgsEnv ?? true,
commandlineArguments: profileCommandLineArgs,
environmentVariables: profileVariables
)