Move bazel_cache_reader to Contents/MacOS/ from Contents/Resources/
Contents/MacOS/ directory is the recommended place for embedded command-line tools:
this is where url(forAuxiliaryExecutable:) looks.
PiperOrigin-RevId: 260204555
diff --git a/BUILD b/BUILD
index 5cbd37a..d0f79f0 100644
--- a/BUILD
+++ b/BUILD
@@ -61,6 +61,9 @@
macos_application(
name = "tulsi",
+ additional_contents = {
+ "//src/tools/bazel_cache_reader": "MacOS",
+ },
app_icons = ["//src/Tulsi:Icon"],
bundle_id = "com.google.Tulsi",
bundle_name = "Tulsi",
diff --git a/src/TulsiGenerator/BUILD b/src/TulsiGenerator/BUILD
index dc22bc4..1bb2cc1 100644
--- a/src/TulsiGenerator/BUILD
+++ b/src/TulsiGenerator/BUILD
@@ -24,7 +24,6 @@
]) + [
"//src/TulsiGenerator/Bazel:WORKSPACE",
"//src/TulsiGenerator/Scripts",
- "//src/tools/bazel_cache_reader",
],
)
diff --git a/src/TulsiGenerator/XcodeProjectGenerator.swift b/src/TulsiGenerator/XcodeProjectGenerator.swift
index fd6aa16..1ca29b2 100644
--- a/src/TulsiGenerator/XcodeProjectGenerator.swift
+++ b/src/TulsiGenerator/XcodeProjectGenerator.swift
@@ -1043,8 +1043,7 @@
// Find bazel_cache_reader in Tulsi.app's Utilities folder.
let bundle = Bundle(for: type(of: self))
- let symbolCacheSourceURL = bundle.url(forResource: XcodeProjectGenerator.ShellCommandsUtil,
- withExtension: "")!
+ let symbolCacheSourceURL = bundle.url(forAuxiliaryExecutable: XcodeProjectGenerator.ShellCommandsUtil)!
// Copy bazel_cache_reader to ~/Library/Application Support/Tulsi/Scripts
installFiles([(symbolCacheSourceURL, XcodeProjectGenerator.ShellCommandsUtil)],
diff --git a/src/TulsiGeneratorTests/BUILD b/src/TulsiGeneratorTests/BUILD
index 66abb16..760254b 100644
--- a/src/TulsiGeneratorTests/BUILD
+++ b/src/TulsiGeneratorTests/BUILD
@@ -12,6 +12,9 @@
macos_unit_test(
name = "TulsiGeneratorTests",
+ additional_contents = {
+ "//src/tools/bazel_cache_reader": "MacOS",
+ },
minimum_os_version = "10.13",
deps = [":TulsiGeneratorTestsLib"],
)
