Move BUILD file for tulsi_aspects to top-level rather than one level down.
This makes it easier to reference the aspect via Tulsi and directly without
having to change the load paths. This also makes it possible to use the
vscode-bazel debugger to debug the Tulsi aspect.
PiperOrigin-RevId: 229985479
diff --git a/src/TulsiGenerator/Bazel/BUILD b/src/TulsiGenerator/Bazel/BUILD
index 453e9ab..ea827c4 100644
--- a/src/TulsiGenerator/Bazel/BUILD
+++ b/src/TulsiGenerator/Bazel/BUILD
@@ -18,9 +18,9 @@
apple_resource_group(
name = "tulsi",
+ resources = [":aspect_build"],
structured_resources = [
"tulsi/tulsi_aspects.bzl",
"tulsi/tulsi_aspects_paths.bzl",
- ":aspect_build",
],
)
diff --git a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
index dcdb7e2..ead8834 100644
--- a/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
+++ b/src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl
@@ -19,7 +19,7 @@
"""
load(
- ":tulsi_aspects_paths.bzl",
+ ":tulsi/tulsi_aspects_paths.bzl",
"AppleBundleInfo",
"AppleTestInfo",
"IosExtensionBundleInfo",
diff --git a/src/TulsiGenerator/BazelAspectInfoExtractor.swift b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
index bff66f0..770679e 100644
--- a/src/TulsiGenerator/BazelAspectInfoExtractor.swift
+++ b/src/TulsiGenerator/BazelAspectInfoExtractor.swift
@@ -241,7 +241,7 @@
// The following flags WILL affect Bazel analysis caching.
// Keep this consistent with bazel_build.py.
"--aspects",
- "@tulsi//tulsi:tulsi_aspects.bzl%\(aspect)",
+ "@tulsi//:tulsi/tulsi_aspects.bzl%\(aspect)",
"--output_groups=tulsi_info,-_,-default", // Build only the aspect artifacts.
])
arguments.append(contentsOf: targets)
diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index f7353f4..d97ffad 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -645,7 +645,7 @@
'--tool_tag=tulsi_v%s:bazel_build' % self.tulsi_version,
'--build_event_json_file=%s' % self.build_events_file_path,
'--noexperimental_build_event_json_file_path_conversion',
- '--aspects', '@tulsi//tulsi:tulsi_aspects.bzl%tulsi_outputs_aspect'])
+ '--aspects', '@tulsi//:tulsi/tulsi_aspects.bzl%tulsi_outputs_aspect'])
if self.is_test and self.gen_runfiles:
bazel_command.append('--output_groups=+tulsi_outputs')
diff --git a/src/TulsiGenerator/TulsiApplicationSupport.swift b/src/TulsiGenerator/TulsiApplicationSupport.swift
index 1208c35..574c1ff 100644
--- a/src/TulsiGenerator/TulsiApplicationSupport.swift
+++ b/src/TulsiGenerator/TulsiApplicationSupport.swift
@@ -40,11 +40,12 @@
/// returns the folder.
func copyTulsiAspectFiles(tulsiVersion: String) throws -> String {
let bundle = Bundle(for: type(of: self))
- let bazelWorkspaceFile = bundle.url(forResource: "WORKSPACE", withExtension: nil)!
+ let aspectWorkspaceFile = bundle.url(forResource: "WORKSPACE", withExtension: nil)!
+ let aspectBuildFile = bundle.url(forResource: "BUILD", withExtension: nil)!
let tulsiFiles = bundle.urls(forResourcesWithExtension: nil, subdirectory: "tulsi")!
let bazelSubpath = (tulsiVersion as NSString).appendingPathComponent("Bazel")
- let bazelPath = try installFiles([bazelWorkspaceFile], toSubpath: bazelSubpath)
+ let bazelPath = try installFiles([aspectWorkspaceFile, aspectBuildFile], toSubpath: bazelSubpath)
let tulsiAspectsSubpath = (bazelSubpath as NSString).appendingPathComponent("tulsi")
try installFiles(tulsiFiles, toSubpath: tulsiAspectsSubpath)
