@@ -13,12 +13,6 @@ many *.scip (https://github.com/scip-code/scip) files.
1313These files encode information about which symbols are referenced from which
1414locations in your source code.
1515
16- This aspect only works on Linux when using the `local` spawn strategy because
17- the `run_shell` action writes SCIP files to the provided
18- --targetroot argument. It should be possible to avoid this requirement
19- in the future if there's a strong desire to make the aspect work with the
20- default (sandboxed) spawn strategy.
21-
2216Use the command below to merge all of these SCIP files into a single index:
2317
2418 find bazel-bin/ -type f -name '*.scip' | xargs cat > index.scip
@@ -33,7 +27,7 @@ Use `src code-intel upload` to upload the unified SCIP file to Sourcegraph:
3327
3428Example command to run this aspect directly:
3529
36- bazel build //... --spawn_strategy=local -- aspects path/to/scip_java.bzl%scip_java_aspect --output_groups=scip --define=sourceroot=$(pwd) --define=scip_java_binary=$(which scip-java) --define=java_home=$JAVA_HOME
30+ bazel build //... --aspects path/to/scip_java.bzl%scip_java_aspect --output_groups=scip --define=scip_java_binary=$(which scip-java) --define=java_home=$JAVA_HOME
3731
3832To learn more about aspects: https://bazel.build/extending/aspects
3933"""
@@ -136,12 +130,12 @@ def _scip_java(target, ctx):
136130 deps = [javac_action .inputs , annotations .processor_classpath ]
137131
138132 ctx .actions .run_shell (
139- # Prefix bazel-out paths with $PWD (the execroot) so they don't depend
140- # on the workspace-level bazel-out convenience symlink, which doesn't
141- # exist on a cold build.
142- command = "\" {}\" index --no-cleanup --aggregate.allow-empty-index --cwd \" {}\" --targetroot \" $PWD/{}\" --scip-config \" $PWD/{}\" --output \" $PWD/{}\" " .format (
133+ # The action runs in the execroot (sandboxed or not), so bazel-out
134+ # paths resolve directly. Prefix them with $PWD to make them absolute,
135+ # which keeps them unambiguous regardless of how scip-java resolves
136+ # relative paths.
137+ command = "\" {}\" index --no-cleanup --aggregate.allow-empty-index --targetroot \" $PWD/{}\" --scip-config \" $PWD/{}\" --output \" $PWD/{}\" " .format (
143138 ctx .var ["scip_java_binary" ],
144- ctx .var ["sourceroot" ],
145139 targetroot .path ,
146140 build_config_path .path ,
147141 scip_output .path ,
0 commit comments