rework daml_compile bazel rule (digital-asset#5070)

Avoiding `damlc compile/package` commands (which we would like to deprecate), and replace with plain `damlc build` together with a post dar->dalf extraction step in the couple of places where we actually want the .dalf for testing. changelog_begin changelog_end
conr2d · Mar 18, 2020 · d81caa9 · d81caa9
1 parent 29c340f
commit d81caa9
Show file tree

Hide file tree

Showing 22 changed files with 315 additions and 246 deletions.
diff --git a/daml-lf/archive/BUILD.bazel b/daml-lf/archive/BUILD.bazel
@@ -14,6 +14,7 @@ load(
 load(
     "//rules_daml:daml.bzl",
     "daml_compile",
+    "daml_compile_with_dalf",
 )
 load("//bazel_tools:pom_file.bzl", "pom_file")
 load("@os_info//:os_info.bzl", "is_windows")
@@ -201,9 +202,9 @@ da_scala_test_suite(
     ],
 )
 
-daml_compile(
+daml_compile_with_dalf(
     name = "DarReaderTest",
-    main_src = "src/test/daml/DarReaderTest.daml",
+    srcs = ["src/test/daml/DarReaderTest.daml"],
 )
 
 # An ad-hoc tool for testing, benchmarking and profiling package decoding performance in isolation.

diff --git a/daml-lf/tests/BUILD.bazel b/daml-lf/tests/BUILD.bazel
@@ -18,15 +18,15 @@ TEST_FILES = \
 [
     daml_compile(
         name = name,
-        main_src = "%s.daml" % name,
+        srcs = ["%s.daml" % name],
         visibility = ["//daml-lf:__subpackages__"],
     )
     for name in TEST_FILES
 ]
 
 daml_compile(
     name = "Optional",
-    main_src = "Optional.daml",
+    srcs = ["Optional.daml"],
     visibility = ["//daml-lf:__subpackages__"],
 )
 

diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -3,8 +3,7 @@
 
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("@os_info//:os_info.bzl", "is_linux", "is_windows")
-load("//rules_daml:daml.bzl", "daml_compile", "daml_test")
-load("//rules_daml:daml-build.bzl", "daml_build_test")
+load("//rules_daml:daml.bzl", "daml_build_test", "daml_compile", "daml_test")
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_environment//:configuration.bzl", "mvn_version", "sdk_version")
 

diff --git a/docs/source/upgrade/example/coin-1.0.0/daml.yaml b/docs/source/upgrade/example/coin-1.0.0/daml.yaml
@@ -10,5 +10,5 @@ dependencies:
   - daml-stdlib
 # END
 parties: [Alice, Bob]
-source: daml
+source: .
 build-options: [--target=1.8]
diff --git a/docs/source/upgrade/example/coin-2.0.0/daml.yaml b/docs/source/upgrade/example/coin-2.0.0/daml.yaml
@@ -10,5 +10,5 @@ dependencies:
   - daml-stdlib
 # END
 parties: [Alice, Bob]
-source: daml
+source: .
 build-options: [--target=1.8]
diff --git a/docs/source/upgrade/example/coin-upgrade/daml.yaml b/docs/source/upgrade/example/coin-upgrade/daml.yaml
@@ -13,5 +13,5 @@ data-dependencies:
   - path/to/coin-2.0.0.dar
 # END
 parties: [Alice, Bob]
-source: daml
+source: .
 build-options: [--target=1.8]
diff --git a/extractor/BUILD.bazel b/extractor/BUILD.bazel
@@ -26,7 +26,7 @@ TEST_DARS = [
 [
     daml_compile(
         name = darmod,
-        main_src = "src/test/resources/damls/%s.daml" % darmod,
+        srcs = ["src/test/resources/damls/%s.daml" % darmod],
         # FixMe: https://github.com/digital-asset/daml/issues/2289
         # change version to lf_latest_version when freezing numeric in the next language version
         target = lf_dev_version,
@@ -68,8 +68,10 @@ module VeryLargeArchive.Blob1 where
 
 daml_compile(
     name = "VeryLargeArchive",
-    srcs = [":VeryLargeArchive_src"],
-    main_src = ":VeryLargeArchive/Blobs.daml",
+    srcs = [
+        ":VeryLargeArchive/Blobs.daml",
+        ":VeryLargeArchive_src",
+    ],
 )
 
 da_scala_library(

diff --git a/language-support/hs/bindings/BUILD.bazel b/language-support/hs/bindings/BUILD.bazel
@@ -36,13 +36,11 @@ da_haskell_library(
 daml_compile(
     name = "for-tests",
     srcs = glob(["test/daml/for-tests/*.daml"]),
-    main_src = "test/daml/for-tests/Main.daml",
 )
 
 daml_compile(
     name = "for-upload",
-    srcs = glob(["test/daml/for-upload/ExtraModule.daml"]),
-    main_src = "test/daml/for-upload/ExtraModule.daml",
+    srcs = ["test/daml/for-upload/ExtraModule.daml"],
 )
 
 da_haskell_test(

diff --git a/language-support/hs/bindings/examples/chat/BUILD.bazel b/language-support/hs/bindings/examples/chat/BUILD.bazel
@@ -7,7 +7,6 @@ load("//rules_daml:daml.bzl", "daml_compile")
 daml_compile(
     name = "Chat",
     srcs = glob(["daml/*.daml"]),
-    main_src = "daml/Chat.daml",
 )
 
 da_haskell_binary(

diff --git a/language-support/hs/bindings/examples/group-chat/BUILD.bazel b/language-support/hs/bindings/examples/group-chat/BUILD.bazel
@@ -8,7 +8,6 @@ load("@os_info//:os_info.bzl", "is_windows")
 daml_compile(
     name = "GroupChat",
     srcs = glob(["daml/GroupChat.daml"]),
-    main_src = "daml/GroupChat.daml",
 )
 
 daml_test(

diff --git a/language-support/hs/bindings/examples/nim/BUILD.bazel b/language-support/hs/bindings/examples/nim/BUILD.bazel
@@ -7,7 +7,6 @@ load("//rules_daml:daml.bzl", "daml_compile")
 daml_compile(
     name = "Nim",
     srcs = glob(["daml/*.daml"]),
-    main_src = "daml/Nim.daml",
 )
 
 da_haskell_binary(

diff --git a/language-support/java/bindings-rxjava/BUILD.bazel b/language-support/java/bindings-rxjava/BUILD.bazel
@@ -117,7 +117,7 @@ da_scala_test_suite(
 
 daml_compile(
     name = "bindings-integration-tests-model-latest",
-    main_src = "src/main/daml/TemplateUtils.daml",
+    srcs = ["src/main/daml/TemplateUtils.daml"],
     target = lf_stable_version,
 )
 

diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel
@@ -92,7 +92,7 @@ da_scala_test(
 
 daml_compile(
     name = "test-daml",
-    main_src = "src/test/daml/Foo.daml",
+    srcs = ["src/test/daml/Foo.daml"],
 )
 
 jar_jar(
@@ -195,7 +195,6 @@ alias(
 daml_compile(
     name = "integration-tests-model-latest",
     srcs = glob(["src/it/daml/**/*.daml"]),
-    main_src = "src/it/daml/Lib.daml",
     target = lf_latest_version,
 )
 
@@ -247,7 +246,6 @@ daml_compile(
 daml_compile(
     name = "ledger-tests-model",
     srcs = glob(["src/ledger-tests/daml/**/*.daml"]),
-    main_src = "src/ledger-tests/daml/AllTests.daml",
     target = lf_stable_version,
 )
 

diff --git a/language-support/scala/codegen-sample-app/BUILD.bazel b/language-support/scala/codegen-sample-app/BUILD.bazel
@@ -19,15 +19,15 @@ load(
 
 daml_compile(
     name = "MyMain",
-    main_src = "src/main/daml/MyMain.daml",
+    srcs = ["src/main/daml/MyMain.daml"],
     # FIXME https://github.com/digital-asset/daml/issues/2256
     # switch to latest once 1.9 is frozen
     target = lf_dev_version,
 )
 
 daml_compile(
     name = "MySecondMain",
-    main_src = "src/main/daml/MySecondMain.daml",
+    srcs = ["src/main/daml/MySecondMain.daml"],
     target = lf_latest_version,
 )
 

diff --git a/language-support/ts/codegen/tests/BUILD.bazel b/language-support/ts/codegen/tests/BUILD.bazel
@@ -7,12 +7,12 @@ load("@build_environment//:configuration.bzl", "sdk_version")
 load("@os_info//:os_info.bzl", "is_windows")
 
 # This rule builds a dar from the daml sources under the 'daml'
-# directory. It is referenced from the 'build-and-lint' test target that
+# directory. It is referenced from the 'build-and-lint-test' target that
 # follows.
 daml_compile(
-    name = "build-and-lint-1.0.0",
+    name = "build-and-lint",
     srcs = glob(["daml/**/*.daml"]),
-    main_src = "daml/Main.daml",
+    version = "1.0.0",
 )
 
 # build-and-lint
@@ -70,7 +70,7 @@ daml_compile(
 #  - Gracefully tears down the processes it started when its work is done.
 # All in all, a pretty slick bit of work!
 sh_test(
-    name = "build-and-lint",
+    name = "build-and-lint-test",
     size = "large",
     srcs = ["build-and-lint.sh"],
     args = [
@@ -79,7 +79,7 @@ sh_test(
         "$(location //:daml2ts)",
         "$(location //ledger/sandbox:sandbox-binary_deploy.jar)",
         "$(location //ledger-service/http-json:http-json-binary_deploy.jar)",
-        "$(location :build-and-lint-1.0.0.dar)",
+        "$(location :build-and-lint.dar)",
         "$(location ts/package.json)",
         "$(location //language-support/ts/daml-types:npm_package)",
         "$(location //language-support/ts/daml-ledger:npm_package)",
@@ -91,7 +91,7 @@ sh_test(
         "//:daml2ts",
         "//ledger/sandbox:sandbox-binary_deploy.jar",
         "//ledger-service/http-json:http-json-binary_deploy.jar",
-        ":build-and-lint-1.0.0.dar",
+        ":build-and-lint.dar",
         "//language-support/ts/daml-types:npm_package",
         "//language-support/ts/daml-ledger:npm_package",
     ] + glob(

diff --git a/ledger-service/http-json/BUILD.bazel b/ledger-service/http-json/BUILD.bazel
@@ -104,7 +104,7 @@ da_scala_binary(
 
 daml_compile(
     name = "Account",
-    main_src = "src/test/daml/Account.daml",
+    srcs = ["src/test/daml/Account.daml"],
 )
 
 da_scala_test(

diff --git a/ledger-service/lf-value-json/BUILD.bazel b/ledger-service/lf-value-json/BUILD.bazel
@@ -30,7 +30,7 @@ da_scala_library(
 
 daml_compile(
     name = "JsonEncodingTest",
-    main_src = "src/test/daml/JsonEncodingTest.daml",
+    srcs = ["src/test/daml/JsonEncodingTest.daml"],
 )
 
 da_scala_test(

diff --git a/ledger/ledger-api-test-tool/BUILD.bazel b/ledger/ledger-api-test-tool/BUILD.bazel
@@ -31,7 +31,7 @@ load(
 
 daml_compile(
     name = "PackageManagementTest",
-    main_src = "src/main/daml/PackageManagementTest.daml",
+    srcs = ["src/main/daml/PackageManagementTest.daml"],
     target = lf_stable_version,
 )
 
@@ -106,7 +106,7 @@ da_scala_binary(
     main_class = "com.daml.ledger.api.testtool.LedgerApiTestTool",
     resources = [
         "src/main/resources/logback.xml",
-        ":PackageManagementTest",
+        ":PackageManagementTest.dar",
         "//ledger/test-common:dar-files",
     ],
     tags = [

diff --git a/ledger/sandbox-perf/BUILD.bazel b/ledger/sandbox-perf/BUILD.bazel
@@ -46,7 +46,7 @@ da_scala_library(
 
 daml_compile(
     name = "LargeTransaction",
-    main_src = "src/perf/resources/damls/LargeTransaction.daml",
+    srcs = ["src/perf/resources/damls/LargeTransaction.daml"],
     visibility = ["//visibility:public"],
 )
 

diff --git a/ledger/test-common/BUILD.bazel b/ledger/test-common/BUILD.bazel
@@ -38,7 +38,7 @@ da_scala_library(
 
 daml_compile(
     name = "SemanticTests",
-    main_src = "src/main/daml/SemanticTests.daml",
+    srcs = ["src/main/daml/SemanticTests.daml"],
     target = lf_stable_version,
     visibility = ["//visibility:public"],
 )
@@ -76,8 +76,8 @@ lf_test_versions = [
             srcs = [
                 "src/main/daml/Iou.daml",
                 "src/main/daml/IouTrade.daml",
+                "src/main/daml/Test.daml",
             ],
-            main_src = "src/main/daml/Test.daml",
             target = target,
             visibility = ["//visibility:public"],
         ),