Use Bazel repos for Tulsi scripts
* Bazel's new --override_repository flag allows us to reference
Tulsi repo on disk without overriding --package_path. It simplifies
Tulsi's package handling, and fixes the issue with spurious rebuilds
when package_path changes between bazel invocations.
--
PiperOrigin-RevId: 159711377
MOS_MIGRATED_REVID=159711377
diff --git a/src/TulsiGenerator/Base.lproj/Localizable.strings b/src/TulsiGenerator/Base.lproj/Localizable.strings
index 387e937..1c37ba3 100644
--- a/src/TulsiGenerator/Base.lproj/Localizable.strings
+++ b/src/TulsiGenerator/Base.lproj/Localizable.strings
@@ -62,9 +62,6 @@
/* Warning to show when a user has selected an XCTest but not its host application. */
"MissingTestHost" = "Failed to link test target '%1$@' to its host, '%2$@'. This test will not be runnable in the generated Xcode project.";
-/* Message to show when the package path was not able to be extracted from the workspace. */
-"PackagePathNotFound" = "Was not able to extract the package path from the workspace. This is a Tulsi or Bazel bug, please report.";
-
/* Message to show when the bundle identifier for watchOS app extension %1$@ could not be found and the resulting project will not be able to launch the watch app. */
"SettingWatchExtensionBundleIDFailed" = "Failed to extract bundle identifier for the extension of watchOS app '%1$@'. Xcode will not be able to launch the watch app on the simulator or devices.";
diff --git a/src/TulsiGenerator/BazelAspectInfoExtractor.swift b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
index dd1d7e6..402f5e3 100644
--- a/src/TulsiGenerator/BazelAspectInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
@@ -33,36 +33,24 @@
/// The location of the Bazel workspace to be examined.
let workspaceRootURL: URL
- /// Fetcher object from which a workspace's package_path may be obtained.
- private let packagePathFetcher: BazelWorkspacePathInfoFetcher
-
private let bundle: Bundle
// Absolute path to the workspace containing the Tulsi aspect bzl file.
private let aspectWorkspacePath: String
- // Relative path from aspectWorkspacePath to the actual Tulsi aspect bzl file.
- private let aspectFileWorkspaceRelativePath: String
private let localizedMessageLogger: LocalizedMessageLogger
private typealias CompletionHandler = (Process, [String]?, String) -> Void
init(bazelURL: URL,
workspaceRootURL: URL,
- packagePathFetcher: BazelWorkspacePathInfoFetcher,
localizedMessageLogger: LocalizedMessageLogger) {
self.bazelURL = bazelURL
self.workspaceRootURL = workspaceRootURL
- self.packagePathFetcher = packagePathFetcher
self.localizedMessageLogger = localizedMessageLogger
bundle = Bundle(for: type(of: self))
let workspaceFilePath = bundle.path(forResource: "WORKSPACE", ofType: "")! as NSString
aspectWorkspacePath = workspaceFilePath.deletingLastPathComponent
- let aspectFilePath = bundle.path(forResource: "tulsi_aspects",
- ofType: "bzl",
- inDirectory: "tulsi")!
- let startIndex = aspectFilePath.characters.index(aspectFilePath.startIndex, offsetBy: aspectWorkspacePath.characters.count + 1)
- aspectFileWorkspaceRelativePath = aspectFilePath.substring(from: startIndex)
}
/// Builds a map of RuleEntry instances keyed by their labels with information extracted from the
@@ -130,15 +118,12 @@
maxValue: 1,
indeterminate: true)
- let workspacePackagePath = packagePathFetcher.getPackagePath()
infoExtractionNotifier.incrementValue()
if let progressNotifier = progressNotifier {
progressNotifier.start()
}
- let augmentedPackagePath = "\(workspacePackagePath):\(aspectWorkspacePath)"
-
var arguments = startupOptions
arguments.append(contentsOf: [
"build",
@@ -151,9 +136,9 @@
"--show_result=0", // Don't bother printing the build results.
"--noshow_loading_progress", // Don't show Bazel's loading progress.
"--noshow_progress", // Don't show Bazel's build progress.
- "--package_path=\(augmentedPackagePath)",
+ "--override_repository=tulsi=\(aspectWorkspacePath)",
"--aspects",
- "/\(aspectFileWorkspaceRelativePath)%\(aspect)",
+ "@tulsi//tulsi:tulsi_aspects.bzl%\(aspect)",
"--output_groups=tulsi-info,-_,-default", // Build only the aspect artifacts.
"--experimental_show_artifacts", // Print the artifacts generated by the aspect.
])
diff --git a/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift b/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
index 908f475..2587539 100644
--- a/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelWorkspaceInfoExtractor.swift
@@ -29,16 +29,11 @@
/// Returns the workspace relative path to the bazel bin symlink. Note that this may block.
var bazelBinPath: String {
- return workspacePathFetcher.getBazelBinPath()
+ return workspacePathInfoFetcher.getBazelBinPath()
}
- /// Returns the package path. Note that this may block.
- var bazelPackagePath: String {
- return workspacePathFetcher.getPackagePath()
- }
-
- /// Fetcher object from which a workspace's package_path may be obtained.
- private let workspacePathFetcher: BazelWorkspacePathInfoFetcher
+ /// Fetcher object from which a workspace's path info may be obtained.
+ private let workspacePathInfoFetcher: BazelWorkspacePathInfoFetcher
private let aspectExtractor: BazelAspectInfoExtractor
private let queryExtractor: BazelQueryInfoExtractor
@@ -50,12 +45,11 @@
init(bazelURL: URL, workspaceRootURL: URL, localizedMessageLogger: LocalizedMessageLogger) {
- workspacePathFetcher = BazelWorkspacePathInfoFetcher(bazelURL: bazelURL,
- workspaceRootURL: workspaceRootURL,
- localizedMessageLogger: localizedMessageLogger)
+ workspacePathInfoFetcher = BazelWorkspacePathInfoFetcher(bazelURL: bazelURL,
+ workspaceRootURL: workspaceRootURL,
+ localizedMessageLogger: localizedMessageLogger)
aspectExtractor = BazelAspectInfoExtractor(bazelURL: bazelURL,
workspaceRootURL: workspaceRootURL,
- packagePathFetcher: workspacePathFetcher,
localizedMessageLogger: localizedMessageLogger)
queryExtractor = BazelQueryInfoExtractor(bazelURL: bazelURL,
workspaceRootURL: workspaceRootURL,
@@ -106,7 +100,7 @@
}
func resolveExternalReferencePath(_ path: String) -> String? {
- let execRoot = workspacePathFetcher.getExecutionRoot()
+ let execRoot = workspacePathInfoFetcher.getExecutionRoot()
let fullURL = NSURL.fileURL(withPathComponents: [execRoot, path])?.resolvingSymlinksInPath()
return fullURL?.path
}
diff --git a/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift b/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
index 7b91d48..9a8a1de 100644
--- a/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
+++ b/src/TulsiGenerator/BazelWorkspaceInfoExtractorProtocol.swift
@@ -41,7 +41,4 @@
/// Workspace-relative path to the directory in which Bazel will install generated artifacts.
var bazelBinPath: String {get}
-
- /// The value of bazel's package_path.
- var bazelPackagePath: String {get}
}
diff --git a/src/TulsiGenerator/BazelWorkspacePathInfoFetcher.swift b/src/TulsiGenerator/BazelWorkspacePathInfoFetcher.swift
index d90b3fb..77436fc 100644
--- a/src/TulsiGenerator/BazelWorkspacePathInfoFetcher.swift
+++ b/src/TulsiGenerator/BazelWorkspacePathInfoFetcher.swift
@@ -16,16 +16,11 @@
/// Handles fetching of interesting paths for a Bazel workspace.
class BazelWorkspacePathInfoFetcher {
- /// The Bazel package_path as defined by the target workspace.
- private var packagePath: String? = nil
/// The Bazel execution_root as defined by the target workspace.
private var executionRoot: String? = nil
/// The bazel bin symlink name as defined by the target workspace.
private var bazelBinSymlinkName: String? = nil
- /// Optional path to the directory in which Bazel symlinks will be created.
- private var bazelSymlinkParentPathOverride: String? = nil
-
/// The location of the bazel binary.
private let bazelURL: URL
/// The location of the Bazel workspace to be examined.
@@ -43,18 +38,6 @@
fetchWorkspaceInfo()
}
- /// Returns the package_path for this fetcher's workspace, blocking until it is available.
- func getPackagePath() -> String {
- if !fetchCompleted { waitForCompletion() }
-
- guard let packagePath = packagePath else {
- localizedMessageLogger.error("PackagePathNotFound",
- comment: "Package path should have been extracted from the workspace.")
- return ""
- }
- return packagePath
- }
-
/// Returns the execution_root for this fetcher's workspace, blocking until it is available.
func getExecutionRoot() -> String {
if !fetchCompleted { waitForCompletion() }
@@ -67,13 +50,6 @@
return executionRoot
}
- /// Returns the tulsi_bazel_symlink_parent_path for this workspace (if it exists), blocking until
- /// the fetch is completed.
- func getBazelSymlinkParentPathOverride() -> String? {
- if !fetchCompleted { waitForCompletion() }
- return bazelSymlinkParentPathOverride
- }
-
/// Returns the bazel bin path for this workspace, blocking until the fetch is completed.
func getBazelBinPath() -> String {
if !fetchCompleted { waitForCompletion() }
@@ -84,9 +60,6 @@
return ""
}
- if let parentPathOverride = getBazelSymlinkParentPathOverride() {
- return (parentPathOverride as NSString).appendingPathComponent(bazelBinSymlinkName)
- }
return bazelBinSymlinkName
}
@@ -98,7 +71,7 @@
semaphore.signal()
}
- // Fetches Bazel package_path info from the registered workspace URL.
+ // Fetches Bazel path info from the registered workspace URL.
private func fetchWorkspaceInfo() {
let profilingStart = localizedMessageLogger.startProfiling("get_package_path",
message: "Fetching bazel path info")
@@ -160,18 +133,8 @@
bazelBinSymlinkName = key
}
- switch key {
- case "execution_root":
- executionRoot = value
-
- case "package_path":
- packagePath = value
-
- case "tulsi_bazel_symlink_parent_path":
- bazelSymlinkParentPathOverride = value
-
- default:
- break
+ if key == "execution_root" {
+ executionRoot = value
}
}
}
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
index 6e92b62..18bf3d0 100644
--- a/src/TulsiGenerator/PBXTargetGenerator.swift
+++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -59,7 +59,6 @@
init(bazelURL: URL,
bazelBinPath: String,
- bazelPackagePath: String,
project: PBXProject,
buildScriptPath: String,
stubInfoPlistPaths: StubInfoPlistPaths,
@@ -68,8 +67,7 @@
localizedMessageLogger: LocalizedMessageLogger,
workspaceRootURL: URL,
suppressCompilerDefines: Bool,
- redactWorkspaceSymlink: Bool,
- redactBazelPackagePath: Bool)
+ redactWorkspaceSymlink: Bool)
/// Generates file references for the given file paths in the associated project without adding
/// them to an indexer target. The paths must be relative to the workspace root. If pathFilters is
@@ -186,9 +184,6 @@
/// The path to the Tulsi generated outputs root. For more information see tulsi_aspects.bzl
let tulsiIncludesPath = "tulsi-includes/x/x"
- /// Bazel's package_path value.
- let bazelPackagePath: String
-
let project: PBXProject
let buildScriptPath: String
let stubInfoPlistPaths: StubInfoPlistPaths
@@ -406,7 +401,6 @@
init(bazelURL: URL,
bazelBinPath: String,
- bazelPackagePath: String,
project: PBXProject,
buildScriptPath: String,
stubInfoPlistPaths: StubInfoPlistPaths,
@@ -415,8 +409,7 @@
localizedMessageLogger: LocalizedMessageLogger,
workspaceRootURL: URL,
suppressCompilerDefines: Bool = false,
- redactWorkspaceSymlink: Bool = false,
- redactBazelPackagePath: Bool = false) {
+ redactWorkspaceSymlink: Bool = false) {
self.bazelURL = bazelURL
self.bazelBinPath = bazelBinPath
self.project = project
@@ -428,13 +421,6 @@
self.workspaceRootURL = workspaceRootURL
self.suppressCompilerDefines = suppressCompilerDefines
self.redactWorkspaceSymlink = redactWorkspaceSymlink
-
- if redactBazelPackagePath {
- // Use a stub value that can be recognized as such in generated projects for tests.
- self.bazelPackagePath = "PLACEHOLDER_PACKAGE_PATH"
- } else {
- self.bazelPackagePath = bazelPackagePath
- }
}
func generateFileReferencesForFilePaths(_ paths: [String], pathFilters: Set<String>?) {
@@ -1580,7 +1566,6 @@
"\(buildLabels) " +
"--bazel \"\(bazelURL.path)\" " +
"--bazel_bin_path \"\(bazelBinPath)\" " +
- "--bazel_package_path \"\(bazelPackagePath)\" " +
"--verbose "
func addPerConfigValuesForOptions(_ optionKeys: [TulsiOptionKey],
diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index 8ed0ead..b91f839 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -172,7 +172,6 @@
self.verbose = 0
self.install_generated_artifacts = False
self.bazel_bin_path = 'bazel-bin'
- self.bazel_package_path = None
self.bazel_executable = None
@staticmethod
@@ -197,9 +196,6 @@
--bazel_bin_path <path>
Path at which Bazel-generated artifacts may be retrieved.
-
- --bazel_package_path <path>
- The value of the package_path variable in Bazel workspace.
""" % sys.argv[0])
usage += '\n' + textwrap.fill(
@@ -325,12 +321,6 @@
self.bazel_bin_path = args[0]
args = args[1:]
- elif arg == '--bazel_package_path':
- if not args:
- return ('Missing required parameter for %s' % arg, 2)
- self.bazel_package_path = args[0]
- args = args[1:]
-
elif arg == '--verbose':
self.verbose += 1
@@ -430,7 +420,6 @@
self.bazel_bin_path = None
# The actual path to the Bazel output directory (not a symlink)
self.real_bazel_bin_path = None
- self.bazel_package_path = None
# The path to the Bazel's sandbox source root.
self.bazel_build_workspace_root = None
self.bazel_genfiles_path = None
@@ -569,7 +558,6 @@
self.build_path = os.path.join(self.bazel_bin_path,
os.environ.get('TULSI_BUILD_PATH', ''))
- self.bazel_package_path = parser.bazel_package_path
(command, retval) = self._BuildBazelCommand(parser)
if retval:
return retval
@@ -675,13 +663,12 @@
# development.
tulsi_package_dir = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', 'Bazel'))
- package_path = '%s:%s' % (self.bazel_package_path, tulsi_package_dir)
bazel_command.extend([
'--experimental_show_artifacts',
'--output_groups=tulsi-outputs,default',
- '--aspects', '/tulsi/tulsi_aspects.bzl%tulsi_outputs_aspect',
- '--package_path=%s' % package_path])
+ '--aspects', '@tulsi//tulsi:tulsi_aspects.bzl%tulsi_outputs_aspect',
+ '--override_repository=tulsi=%s' % tulsi_package_dir])
if self.code_coverage_enabled:
self._PrintVerbose('Enabling code coverage information.')
diff --git a/src/TulsiGenerator/XcodeProjectGenerator.swift b/src/TulsiGenerator/XcodeProjectGenerator.swift
index 2e67c8b..353e364 100644
--- a/src/TulsiGenerator/XcodeProjectGenerator.swift
+++ b/src/TulsiGenerator/XcodeProjectGenerator.swift
@@ -101,10 +101,6 @@
/// generated by Bazel.
var suppressGeneratedArtifactFolderCreation = false
- /// Exposed for testing. Instead of writing the real bazel package path extracted from the
- /// `bazel info` output, use a stub value.
- var redactBazelPackagePath = false
-
init(workspaceRootURL: URL,
config: TulsiGeneratorConfig,
localizedMessageLogger: LocalizedMessageLogger,
@@ -278,7 +274,6 @@
let generator = pbxTargetGeneratorType.init(bazelURL: config.bazelURL,
bazelBinPath: workspaceInfoExtractor.bazelBinPath,
- bazelPackagePath: workspaceInfoExtractor.bazelPackagePath,
project: xcodeProject,
buildScriptPath: buildScriptPath,
stubInfoPlistPaths: stubInfoPlistPaths,
@@ -287,8 +282,7 @@
localizedMessageLogger: localizedMessageLogger,
workspaceRootURL: workspaceRootURL,
suppressCompilerDefines: suppressCompilerDefines,
- redactWorkspaceSymlink: redactWorkspaceSymlink,
- redactBazelPackagePath: redactBazelPackagePath)
+ redactWorkspaceSymlink: redactWorkspaceSymlink)
if let additionalFilePaths = config.additionalFilePaths {
generator.generateFileReferencesForFilePaths(additionalFilePaths)
diff --git a/src/TulsiGeneratorIntegrationTests/AspectTests.swift b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
index f5edb14..7f66497 100644
--- a/src/TulsiGeneratorIntegrationTests/AspectTests.swift
+++ b/src/TulsiGeneratorIntegrationTests/AspectTests.swift
@@ -24,7 +24,6 @@
super.setUp()
aspectInfoExtractor = BazelAspectInfoExtractor(bazelURL: bazelURL,
workspaceRootURL: workspaceRootURL!,
- packagePathFetcher: packagePathFetcher,
localizedMessageLogger: localizedMessageLogger)
}
@@ -361,7 +360,6 @@
super.setUp()
aspectInfoExtractor = BazelAspectInfoExtractor(bazelURL: bazelURL,
workspaceRootURL: workspaceRootURL!,
- packagePathFetcher: packagePathFetcher,
localizedMessageLogger: localizedMessageLogger)
installBUILDFile("TestSuiteRoot",
intoSubdirectory: testDir,
diff --git a/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift b/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
index 6ed5395..1c06d04 100644
--- a/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
+++ b/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
@@ -31,7 +31,7 @@
var bazelStartupOptions = [String]()
var bazelBuildOptions = [String]()
var workspaceRootURL: URL! = nil
- var packagePathFetcher: BazelWorkspacePathInfoFetcher! = nil
+ var workspaceInfoFetcher: BazelWorkspacePathInfoFetcher! = nil
var localizedMessageLogger: DirectLocalizedMessageLogger! = nil
private var pathsToCleanOnTeardown = Set<URL>()
@@ -107,15 +107,15 @@
localizedMessageLogger = DirectLocalizedMessageLogger()
localizedMessageLogger.startLogging()
- packagePathFetcher = BazelWorkspacePathInfoFetcher(bazelURL: bazelURL,
- workspaceRootURL: workspaceRootURL,
- localizedMessageLogger: localizedMessageLogger)
+ workspaceInfoFetcher = BazelWorkspacePathInfoFetcher(bazelURL: bazelURL,
+ workspaceRootURL: workspaceRootURL,
+ localizedMessageLogger: localizedMessageLogger)
}
override func tearDown() {
super.tearDown()
cleanCreatedFiles()
- packagePathFetcher = nil
+ workspaceInfoFetcher = nil
if localizedMessageLogger != nil {
localizedMessageLogger.stopLogging()
}
diff --git a/src/TulsiGeneratorIntegrationTests/EndToEndIntegrationTestCase.swift b/src/TulsiGeneratorIntegrationTests/EndToEndIntegrationTestCase.swift
index 50f13f1..ca3fc50 100644
--- a/src/TulsiGeneratorIntegrationTests/EndToEndIntegrationTestCase.swift
+++ b/src/TulsiGeneratorIntegrationTests/EndToEndIntegrationTestCase.swift
@@ -120,8 +120,6 @@
projectGenerator.xcodeProjectGenerator.usernameFetcher = { "_TEST_USER_" }
// The workspace symlink is forced to a known value.
projectGenerator.xcodeProjectGenerator.redactWorkspaceSymlink = true
- // The bazel package path is forced to a known value.
- projectGenerator.xcodeProjectGenerator.redactBazelPackagePath = true
let errorInfo: String
do {
return try projectGenerator.generateXcodeProjectInFolder(outputFolderURL)
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index 061ea09..751bcdf 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -709,7 +709,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558360BC810A00000000 /* Build configuration list for PBXNativeTarget "Watch2Extension" */;
buildPhases = (
- 84B42271D319D0EF00000000 /* ShellScript */,
+ 84B4227197CD986C00000000 /* ShellScript */,
);
buildRules = (
);
@@ -725,7 +725,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755839DDBAE2300000000 /* Build configuration list for PBXNativeTarget "TodayExtension" */;
buildPhases = (
- 84B422711D8DB1FC00000000 /* ShellScript */,
+ 84B42271DD828A6F00000000 /* ShellScript */,
);
buildRules = (
);
@@ -741,7 +741,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B4227185E2281500000000 /* ShellScript */,
+ 84B42271DFD43A6800000000 /* ShellScript */,
);
buildRules = (
);
@@ -884,7 +884,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755830DB9CDD900000000 /* Build configuration list for PBXNativeTarget "WatchExtension" */;
buildPhases = (
- 84B422711D8DB1FC00000001 /* ShellScript */,
+ 84B42271DD828A6F00000001 /* ShellScript */,
);
buildRules = (
);
@@ -916,7 +916,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B422714C89CEE800000000 /* ShellScript */,
+ 84B42271EA52FA6D00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -974,7 +974,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422711D8DB1FC00000000 /* ShellScript */ = {
+ 84B4227197CD986C00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -985,10 +985,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:TodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Watch2Extension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422711D8DB1FC00000001 /* ShellScript */ = {
+ 84B42271DD828A6F00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -999,10 +999,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:WatchExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:TodayExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422714C89CEE800000000 /* ShellScript */ = {
+ 84B42271DD828A6F00000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -1013,10 +1013,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:WatchExtension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B4227185E2281500000000 /* ShellScript */ = {
+ 84B42271DFD43A6800000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -1027,10 +1027,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271D319D0EF00000000 /* ShellScript */ = {
+ 84B42271EA52FA6D00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -1041,7 +1041,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:Watch2Extension --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_complex:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index c27d20d..5938b3f 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -249,7 +249,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583978C206500000000 /* Build configuration list for PBXNativeTarget "TargetApplication" */;
buildPhases = (
- 84B42271210495C300000000 /* ShellScript */,
+ 84B42271D1DD35A200000000 /* ShellScript */,
);
buildRules = (
);
@@ -265,7 +265,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B422714FFCC59D00000000 /* ShellScript */,
+ 84B422716F20C18A00000000 /* ShellScript */,
);
buildRules = (
);
@@ -297,7 +297,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B422716D67971E00000000 /* ShellScript */,
+ 84B422712C9266AF00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -362,7 +362,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271210495C300000000 /* ShellScript */ = {
+ 84B422712C9266AF00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -373,10 +373,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:TargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422714FFCC59D00000000 /* ShellScript */ = {
+ 84B422716F20C18A00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -387,10 +387,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422716D67971E00000000 /* ShellScript */ = {
+ 84B42271D1DD35A200000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -401,7 +401,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple:TargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
index 7c7e2d6..95d10c4 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleSkylarkProject.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755837696EE3600000000 /* Build configuration list for PBXNativeTarget "XCUITest" */;
buildPhases = (
- 84B422718BD7041400000000 /* ShellScript */,
+ 84B42271AA81D59F00000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -350,7 +350,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583218595F600000000 /* Build configuration list for PBXNativeTarget "SkylarkApplication" */;
buildPhases = (
- 84B422717004377D00000000 /* ShellScript */,
+ 84B42271FE3671F600000000 /* ShellScript */,
);
buildRules = (
);
@@ -383,7 +383,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583B2A6125600000000 /* Build configuration list for PBXNativeTarget "XCTest" */;
buildPhases = (
- 84B4227153BD640400000000 /* ShellScript */,
+ 84B422716CB3531700000000 /* ShellScript */,
84B42271339F729600000000 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
@@ -402,7 +402,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755835CC0E52B00000000 /* Build configuration list for PBXNativeTarget "SkylarkTargetApplication" */;
buildPhases = (
- 84B4227173D1A42500000000 /* ShellScript */,
+ 84B42271067AEFB200000000 /* ShellScript */,
);
buildRules = (
);
@@ -454,6 +454,20 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
+ 84B42271067AEFB200000000 /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 0;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/bash;
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkTargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ showEnvVarsInLog = 1;
+ };
84B42271339F729600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
@@ -468,7 +482,7 @@
shellScript = "# Script to generate specific Swift files Xcode expects when running tests.\nset -eu\nARCH_ARRAY=($ARCHS)\nSUFFIXES=(swiftdoc swiftmodule h)\nfor ARCH in \"${ARCH_ARRAY[@]}\"\ndo\n for SUFFIX in \"${SUFFIXES[@]}\"\n do\n touch \"$OBJECT_FILE_DIR_normal/$ARCH/$PRODUCT_NAME.$SUFFIX\"\n done\ndone\n";
showEnvVarsInLog = 1;
};
- 84B4227153BD640400000000 /* ShellScript */ = {
+ 84B422716CB3531700000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -479,10 +493,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422717004377D00000000 /* ShellScript */ = {
+ 84B42271AA81D59F00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -493,10 +507,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCUITest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B4227173D1A42500000000 /* ShellScript */ = {
+ 84B42271FE3671F600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -507,21 +521,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkTargetApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
- showEnvVarsInLog = 1;
- };
- 84B422718BD7041400000000 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 0;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:XCUITest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_simple_skylark:SkylarkApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 --keep_going -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index e8c97b6..5286039 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -116,7 +116,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583F843F89400000000 /* Build configuration list for PBXNativeTarget "Application" */;
buildPhases = (
- 84B42271458F98E700000000 /* ShellScript */,
+ 84B42271CC2A946600000000 /* ShellScript */,
);
buildRules = (
);
@@ -170,7 +170,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271458F98E700000000 /* ShellScript */ = {
+ 84B42271CC2A946600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -181,7 +181,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_swift:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //tulsi_e2e_swift:Application --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index f1d0d9f..793fdbe 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -167,7 +167,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558391D6432200000000 /* Build configuration list for PBXNativeTarget "TestSuite-One-XCTest" */;
buildPhases = (
- 84B42271D9F7D5C500000001 /* ShellScript */,
+ 84B42271F474DD4200000001 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
buildRules = (
@@ -185,7 +185,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755834E80A3C200000000 /* Build configuration list for PBXNativeTarget "TestSuite-Three-XCTest" */;
buildPhases = (
- 84B42271DF28570600000000 /* ShellScript */,
+ 84B42271E269483C00000000 /* ShellScript */,
605793E20000000000000002 /* Sources */,
);
buildRules = (
@@ -219,7 +219,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755831AEA36FA00000000 /* Build configuration list for PBXNativeTarget "TestSuite-Two-XCTest" */;
buildPhases = (
- 84B42271D9F7D5C500000000 /* ShellScript */,
+ 84B42271F474DD4200000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -237,7 +237,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B42271F6378B0B00000000 /* ShellScript */,
+ 84B422716FD4466600000000 /* ShellScript */,
);
buildRules = (
);
@@ -289,7 +289,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271D9F7D5C500000000 /* ShellScript */ = {
+ 84B422716FD4466600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -300,10 +300,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Two:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271D9F7D5C500000001 /* ShellScript */ = {
+ 84B42271E269483C00000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -314,10 +314,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271DF28570600000000 /* ShellScript */ = {
+ 84B42271F474DD4200000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -328,10 +328,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Two:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271F6378B0B00000000 /* ShellScript */ = {
+ 84B42271F474DD4200000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -342,7 +342,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/One:XCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 548ed36..2da4fe7 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -154,7 +154,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558368BD242900000000 /* Build configuration list for PBXNativeTarget "TestSuiteNonXCTest" */;
buildPhases = (
- 84B42271FB63504200000000 /* ShellScript */,
+ 84B422711919F46500000000 /* ShellScript */,
);
buildRules = (
);
@@ -170,7 +170,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558395C0260B00000000 /* Build configuration list for PBXNativeTarget "TestSuiteXCTest" */;
buildPhases = (
- 84B42271F6378B0B00000000 /* ShellScript */,
+ 84B422716FD4466600000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -188,7 +188,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B42271F6378B0B00000001 /* ShellScript */,
+ 84B422716FD4466600000001 /* ShellScript */,
);
buildRules = (
);
@@ -233,7 +233,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B42271F6378B0B00000000 /* ShellScript */ = {
+ 84B422711919F46500000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -244,10 +244,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteNonXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271F6378B0B00000001 /* ShellScript */ = {
+ 84B422716FD4466600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -258,10 +258,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271FB63504200000000 /* ShellScript */ = {
+ 84B422716FD4466600000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -272,7 +272,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteNonXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index 5d8e51b..8d87059 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -155,7 +155,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558395C0260B00000000 /* Build configuration list for PBXNativeTarget "TestSuiteXCTest" */;
buildPhases = (
- 84B42271F6378B0B00000000 /* ShellScript */,
+ 84B422716FD4466600000000 /* ShellScript */,
605793E20000000000000000 /* Sources */,
);
buildRules = (
@@ -189,7 +189,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE475583CC86731D00000000 /* Build configuration list for PBXNativeTarget "tagged_xctest_2" */;
buildPhases = (
- 84B422711614D37900000000 /* ShellScript */,
+ 84B422710292AA7000000000 /* ShellScript */,
605793E20000000000000001 /* Sources */,
);
buildRules = (
@@ -207,7 +207,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE4755838C86721A00000000 /* Build configuration list for PBXNativeTarget "tagged_xctest_1" */;
buildPhases = (
- 84B422711614D37900000001 /* ShellScript */,
+ 84B422710292AA7000000001 /* ShellScript */,
605793E20000000000000002 /* Sources */,
);
buildRules = (
@@ -225,7 +225,7 @@
isa = PBXNativeTarget;
buildConfigurationList = DE47558305B5AF7800000000 /* Build configuration list for PBXNativeTarget "TestApplication" */;
buildPhases = (
- 84B42271F6378B0B00000001 /* ShellScript */,
+ 84B422716FD4466600000001 /* ShellScript */,
);
buildRules = (
);
@@ -277,7 +277,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 84B422711614D37900000000 /* ShellScript */ = {
+ 84B422710292AA7000000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -288,10 +288,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_2 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_2 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B422711614D37900000001 /* ShellScript */ = {
+ 84B422710292AA7000000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -302,10 +302,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_1 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite/Three:tagged_xctest_1 --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271F6378B0B00000000 /* ShellScript */ = {
+ 84B422716FD4466600000000 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -316,10 +316,10 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestSuiteXCTest --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
- 84B42271F6378B0B00000001 /* ShellScript */ = {
+ 84B422716FD4466600000001 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 0;
files = (
@@ -330,7 +330,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --bazel_package_path \"PLACEHOLDER_PACKAGE_PATH\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
+ shellScript = "set -e\ncd \"${SRCROOT}/../..\"\nexec \"${PROJECT_FILE_PATH}/.tulsi/Scripts/bazel_build.py\" //TestSuite:TestApplication --bazel \"/fake/tulsi_test_bazel\" --bazel_bin_path \"blaze-bin\" --verbose --bazel_options[Debug] --define=TULSI_TEST=dbg --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_options[Release] --define=TULSI_TEST=rel --ios_minimum_os=7.0 --macos_minimum_os=10.10 --tvos_minimum_os=10.0 --watchos_minimum_os=3.0 -- --bazel_startup_options[Debug] --blazerc=/dev/null -- --install_generated_artifacts";
showEnvVarsInLog = 1;
};
/* End PBXShellScriptBuildPhase section */
diff --git a/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift b/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
index df5a97a..1f37f54 100644
--- a/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
+++ b/src/TulsiGeneratorTests/MockWorkspaceInfoExtractor.swift
@@ -25,7 +25,6 @@
var bazelURL = URL(fileURLWithPath: "")
var bazelBinPath = "bazel-bin"
- var bazelPackagePath = "%workspace%"
func extractRuleInfoFromProject(_ project: TulsiProject) -> [RuleInfo] {
return []
diff --git a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
index 0dad4cf..e85f84a 100644
--- a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
+++ b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
@@ -33,7 +33,6 @@
project = PBXProject(name: "TestProject")
targetGenerator = PBXTargetGenerator(bazelURL: bazelURL,
bazelBinPath: "bazel-bin",
- bazelPackagePath: "%workspace%",
project: project,
buildScriptPath: "",
stubInfoPlistPaths: stubPlistPaths,
@@ -131,7 +130,6 @@
messageLogger = MockLocalizedMessageLogger()
targetGenerator = PBXTargetGenerator(bazelURL: bazelURL,
bazelBinPath: "bazel-bin",
- bazelPackagePath: "%workspace%",
project: project,
buildScriptPath: "",
stubInfoPlistPaths: stubPlistPaths,
diff --git a/src/TulsiGeneratorTests/XcodeProjectGeneratorTests.swift b/src/TulsiGeneratorTests/XcodeProjectGeneratorTests.swift
index a4ed745..c7e656f 100644
--- a/src/TulsiGeneratorTests/XcodeProjectGeneratorTests.swift
+++ b/src/TulsiGeneratorTests/XcodeProjectGeneratorTests.swift
@@ -387,7 +387,6 @@
required init(bazelURL: URL,
bazelBinPath: String,
- bazelPackagePath: String,
project: PBXProject,
buildScriptPath: String,
stubInfoPlistPaths: StubInfoPlistPaths,
@@ -396,8 +395,7 @@
localizedMessageLogger: LocalizedMessageLogger,
workspaceRootURL: URL,
suppressCompilerDefines: Bool,
- redactWorkspaceSymlink: Bool,
- redactBazelPackagePath: Bool) {
+ redactWorkspaceSymlink: Bool) {
self.project = project
}
