Move Tulsi link into the generated xcodeproj (<xcodeproj>/.tulsi/tulsi-workspace)
PiperOrigin-RevId: 263218724
diff --git a/src/TulsiGenerator/PBXTargetGenerator.swift b/src/TulsiGenerator/PBXTargetGenerator.swift
index e814465..d523190 100644
--- a/src/TulsiGenerator/PBXTargetGenerator.swift
+++ b/src/TulsiGenerator/PBXTargetGenerator.swift
@@ -755,8 +755,12 @@
// workspace. While this is often identical to the workspace, it sometimes collects other paths
// and is the better option for most Xcode project path references.
// This directory is symlinked to `tulsi-workspace` during builds.
+ // The symlink is located inside of the project package as opposed to relative to the workspace
+ // so that it is using the same local file system as the project to maximize performance.
+ // In some cases where the workspace was on a remote volume, jumping through the symlink on the
+ // remote volume that pointed back to local disk was causing performance issues.
buildSettings["\(PBXTargetGenerator.BazelWorkspaceSymlinkVarName)"] =
- "${\(PBXTargetGenerator.WorkspaceRootVarName)}/\(PBXTargetGenerator.TulsiWorkspacePath)"
+ "$(PROJECT_FILE_PATH)/.tulsi/\(PBXTargetGenerator.TulsiWorkspacePath)"
buildSettings["TULSI_VERSION"] = tulsiVersion
diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index 75e4b25..897c7ac 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -1662,10 +1662,11 @@
def _LinkTulsiWorkspace(self):
"""Links the Bazel Workspace to the Tulsi Workspace (`tulsi-workspace`)."""
- tulsi_workspace = self.workspace_root + '/tulsi-workspace'
+ tulsi_workspace = os.path.join(self.project_file_path,
+ '.tulsi',
+ 'tulsi-workspace')
if os.path.islink(tulsi_workspace):
os.unlink(tulsi_workspace)
-
os.symlink(self.bazel_exec_root, tulsi_workspace)
if not os.path.exists(tulsi_workspace):
_PrintXcodeError(
diff --git a/src/TulsiGenerator/XcodeProjectGenerator.swift b/src/TulsiGenerator/XcodeProjectGenerator.swift
index 1ca29b2..8e56234 100644
--- a/src/TulsiGenerator/XcodeProjectGenerator.swift
+++ b/src/TulsiGenerator/XcodeProjectGenerator.swift
@@ -231,7 +231,7 @@
installStubExtensionPlistFiles(projectURL,
rules: projectInfo.buildRuleEntries.filter { $0.pbxTargetType?.isiOSAppExtension ?? false },
plistPaths: plistPaths)
- linkTulsiWorkspace()
+ linkTulsiWorkspace(projectURL)
return projectURL
}
@@ -597,12 +597,12 @@
// Links tulsi-workspace to the current Bazel execution root. This may be overwritten during
// builds, but is useful to include in project generation for users who have local_repository
// references.
- private func linkTulsiWorkspace() {
+ private func linkTulsiWorkspace(_ projectURL: URL) {
// Don't create the tulsi-workspace symlink for tests.
guard !self.redactWorkspaceSymlink else { return }
- let path = workspaceRootURL.appendingPathComponent(PBXTargetGenerator.TulsiWorkspacePath,
- isDirectory: false).path
+ let path = projectURL.appendingPathComponent(".tulsi/\(PBXTargetGenerator.TulsiWorkspacePath)",
+ isDirectory: false).path
let bazelExecRoot = self.workspaceInfoExtractor.bazelExecutionRoot;
// See if tulsi-includes is already present.
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index fab8d50..07900af 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
@@ -995,7 +995,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = ComplexSingleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1094,7 +1094,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = ComplexSingleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1276,7 +1276,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = ComplexSingleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1478,7 +1478,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = ComplexSingleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index 36403b3..76e2fc2 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
@@ -439,7 +439,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -550,7 +550,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -649,7 +649,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -753,7 +753,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index 557e38d..670f4cb 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
@@ -684,7 +684,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -802,7 +802,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -924,7 +924,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1075,7 +1075,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MacOSTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
index 6c436e2..738436d 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
@@ -319,7 +319,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MultiExtensionProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -430,7 +430,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MultiExtensionProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -517,7 +517,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MultiExtensionProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -609,7 +609,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = MultiExtensionProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index f8a2114..927ce75 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
@@ -300,7 +300,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleCCProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -360,7 +360,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleCCProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -435,7 +435,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = macosx;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleCCProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -515,7 +515,7 @@
SDKROOT = macosx;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleCCProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index d34df0d..8ff2af6 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
@@ -641,7 +641,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -739,7 +739,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -869,7 +869,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1020,7 +1020,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SimpleProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
index 6528fda..83a6522 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
@@ -333,7 +333,7 @@
SDKROOT = appletvos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SkylarkBundlingProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -419,7 +419,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = appletvos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SkylarkBundlingProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -502,7 +502,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = appletvos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SkylarkBundlingProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -590,7 +590,7 @@
SDKROOT = appletvos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SkylarkBundlingProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 334fbfd..acbc963 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
@@ -376,7 +376,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
SWIFT_VERSION = 4;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SwiftProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -438,7 +438,7 @@
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
SWIFT_VERSION = 4;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SwiftProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -534,7 +534,7 @@
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
SWIFT_VERSION = 4;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SwiftProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -635,7 +635,7 @@
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
SWIFT_VERSION = 4;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = SwiftProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index 440b270..be066b8 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
@@ -750,7 +750,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -889,7 +889,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1032,7 +1032,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1212,7 +1212,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteExplicitXCTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index e6ad945..6a914c0 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
@@ -421,7 +421,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -494,7 +494,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -579,7 +579,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -685,7 +685,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteLocalTaggedTestsProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index f932883..46a6ecb 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
@@ -649,7 +649,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -762,7 +762,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -887,7 +887,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -1049,7 +1049,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = TestSuiteRecursiveTestSuiteProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index c7787aa..3f6255b 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
@@ -460,7 +460,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = WatchProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -571,7 +571,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = WatchProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -682,7 +682,7 @@
ONLY_ACTIVE_ARCH = YES;
PYTHONIOENCODING = utf8;
SDKROOT = iphoneos;
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = WatchProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
@@ -798,7 +798,7 @@
SDKROOT = iphoneos;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
- TULSI_BWRS = "${TULSI_WR}/tulsi-workspace";
+ TULSI_BWRS = "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace";
TULSI_PROJECT = WatchProject;
TULSI_VERSION = 9.99.999.9999;
TULSI_WR = "${SRCROOT}/..";
diff --git a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
index e4b0d39..986694d 100644
--- a/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
+++ b/src/TulsiGeneratorTests/PBXTargetGeneratorTests.swift
@@ -225,7 +225,7 @@
"PYTHONIOENCODING": "utf8",
"TULSI_VERSION": testTulsiVersion,
"TULSI_WR": "$(SRCROOT)",
- "TULSI_BWRS": "${TULSI_WR}/tulsi-workspace",
+ "TULSI_BWRS": "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace",
]
XCTAssertNotNil(topLevelConfigs["Debug"])
@@ -278,7 +278,7 @@
"PYTHONIOENCODING": "utf8",
"TULSI_VERSION": testTulsiVersion,
"TULSI_WR": "$(SRCROOT)",
- "TULSI_BWRS": "${TULSI_WR}/tulsi-workspace",
+ "TULSI_BWRS": "$(PROJECT_FILE_PATH)/.tulsi/tulsi-workspace",
]
XCTAssertNotNil(topLevelConfigs["Debug"])
