Skip to content

Commit

Permalink
Improve logic for building daml-lf-archive-java
Browse files Browse the repository at this point in the history
daml-lf-archive-java is put together from the proto sources with the
compiled java classes. However, the logic that picks the java classes
was dependent on the output of $(locations :daml_lf_proto_lib_java),
because it always would pick the first item.

The new logic filters by name rather than position.

Fixes #2058.
  • Loading branch information
gerolf-da committed Jul 9, 2019
1 parent 5c36206 commit 7d860eb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion daml-lf/archive/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ genrule(
],
outs = ["daml_lf_archive_java.jar"],
cmd = """
INPUT=$$(echo "$(locations :daml_lf_proto_lib_java)" | cut -d ' ' -f 1)
INPUT=$$(echo "$(locations :daml_lf_proto_lib_java)" | tr ' ' '\n' | grep -v '\-src.jar')
cp -L $$INPUT $@
chmod u+w $@
$(location @zip_dev_env//:zip) -g $@ $(locations :proto_srcs)
Expand Down

0 comments on commit 7d860eb

Please sign in to comment.