From 840ee94bf629f07fedeccb979f0dced7c8ce7b99 Mon Sep 17 00:00:00 2001 From: Gerolf Seitz Date: Tue, 9 Jul 2019 13:44:36 +0200 Subject: [PATCH] Improve logic for building daml-lf-archive-java (#2059) 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. --- daml-lf/archive/BUILD.bazel | 2 +- unreleased.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/daml-lf/archive/BUILD.bazel b/daml-lf/archive/BUILD.bazel index 106429ff9c4..21c04ebf4d0 100644 --- a/daml-lf/archive/BUILD.bazel +++ b/daml-lf/archive/BUILD.bazel @@ -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) diff --git a/unreleased.rst b/unreleased.rst index 8c452fded63..faa4611a797 100644 --- a/unreleased.rst +++ b/unreleased.rst @@ -10,3 +10,4 @@ HEAD — ongoing -------------- - [daml assistant] Fix VSCode path for use if not already in PATH on mac +- [DAML-LF] Fixed regression that produced an invalid daml-lf-archive artefact. See `#2058 `__.