ocaml/ocaml.bzl

@@ -1,49 +1,55 @@
 load("//ocaml:repo.bzl", "OPAM_ROOT_DIR", "OCAML_VERSION", "COMPILER_NAME")
-OCAML_FILETYPES = FileType([
+OCAML_FILETYPES = [
     ".ml", ".mli", ".cmx", ".cmo", ".cma"
-])
+]
 
 _ocaml_toolchain_attrs = {
     "_opam": attr.label(
         default = Label("@opam//:opam"),
         executable = True,
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         cfg = "host",
     ),
     "_ocamlc": attr.label(
         default = Label("@ocaml_toolchain//:ocamlc"),
         executable = True,
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         cfg = "host",
     ),
     "_ocamlopt": attr.label(
         default = Label("@ocaml_toolchain//:ocamlopt"),
         executable = True,
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         cfg = "host",
     ),
     "_ocamlfind": attr.label(
         default = Label("@ocaml_toolchain//:ocamlfind"),
         executable = True,
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         cfg = "host",
     ),
     "_ocamlbuild": attr.label(
         default = Label("@ocaml_toolchain//:ocamlbuild"),
         executable = True,
-        single_file = True,
-        allow_files = True,
+        allow_single_file = True,
         cfg = "host",
     )
 }
 
+def _add(attrs, *others):
+    new = {}
+    new.update(attrs)
+    for o in others:
+        for name in o.keys():
+            if name in new:
+                fail("Attr '%s' is defined twice." % name)
+            new[name] = o[name]
+    return new
+
 def _ocaml_interface_impl(ctx):
   ctx.actions.run_shell(
-      inputs = [ctx.file.src, ctx.executable._ocamlc],
+      tools = [ctx.executable._ocamlc],
+      inputs = [ctx.file.src],
       outputs = [ctx.outputs.mli],
       progress_message = "Compiling interface file %s" % ctx.label,
       mnemonic="OCamlc",
@@ -54,12 +60,11 @@ def _ocaml_interface_impl(ctx):
 
 ocaml_interface = rule(
     implementation = _ocaml_interface_impl,
-    attrs = {
+    attrs = _add({
         "src": attr.label(
-            allow_files = OCAML_FILETYPES,
-            single_file = True,
+            allow_single_file = OCAML_FILETYPES,
         ),
-    } + _ocaml_toolchain_attrs,
+    }, _ocaml_toolchain_attrs),
     outputs = { "mli": "%{name}.mli" },
 )
 
@@ -120,7 +125,8 @@ def _ocaml_binary_impl(ctx):
   ])
 
   ctx.actions.run_shell(
-      inputs = ctx.files.srcs + [ocamlfind, ocamlbuild, opam],
+      tools = [ocamlfind, ocamlbuild, opam],
+      inputs = ctx.files.srcs,
       outputs = [ctx.outputs.executable, ctx.outputs.build_dir],
       command = command,
       mnemonic = "Ocamlbuild",
@@ -132,19 +138,18 @@ def _ocaml_binary_impl(ctx):
 
 _ocaml_binary = rule(
     implementation = _ocaml_binary_impl,
-    attrs = {
+    attrs = _add({
         "srcs": attr.label_list(
             allow_files = OCAML_FILETYPES
         ),
         "deps": attr.label_list(),
         "src_root": attr.label(
-            allow_files = OCAML_FILETYPES,
-            single_file = True,
+            allow_single_file = OCAML_FILETYPES,
             mandatory = True,
         ),
         "opam_packages": attr.string_list(default = []),
         "bin_type": attr.string(default = "native")
-    } + _ocaml_toolchain_attrs,
+    }, _ocaml_toolchain_attrs),
     executable = True,
     outputs = { "build_dir": "_build_%{name}" },
 )

ocaml/repo.bzl

@@ -7,7 +7,7 @@ COMPILER_NAME = "ocaml-base-compiler.%s" % OCAML_VERSION
 DEBUG_QUIET = True
 
 # The path to the root opam directory
-OPAM_ROOT_DIR = "OPAM_ROOT_DIR"
+OPAM_ROOT_DIR = ".opam_root_dir"
 
 # Set up OCaml's toolchain (ocamlc, ocamlbuild, ocamlfind)
 _OCAML_TOOLCHAIN_BUILD = """
@@ -42,23 +42,23 @@ filegroup(
 def _ocaml_toolchain_impl(repository_ctx):
   opam_bin = repository_ctx.path(repository_ctx.attr._opam)
 
-  # Initialize opam and its root directory
+  repository_ctx.report_progress("Initializing opam and its root directory..")
   repository_ctx.execute([
       opam_bin,
       "init",
       "--root", OPAM_ROOT_DIR,
       "--no-setup",
       "--comp", COMPILER_NAME
-  ], quiet = DEBUG_QUIET)
+  ], quiet = False)
 
-  # Download the OCaml compiler
+  repository_ctx.report_progress("Downloading the OCaml compiler..")
   repository_ctx.execute([
       opam_bin,
       "switch", COMPILER_NAME,
       "--root", OPAM_ROOT_DIR
   ], quiet = DEBUG_QUIET)
 
-  # Install OCamlbuild
+  repository_ctx.report_progress("Installing ocamlbuild..")
   repository_ctx.execute([
       opam_bin,
       "install",
@@ -67,7 +67,7 @@ def _ocaml_toolchain_impl(repository_ctx):
       "--root", OPAM_ROOT_DIR
   ], quiet = DEBUG_QUIET)
 
-  # Install OCamlfind
+  repository_ctx.report_progress("Installing ocamlfind..")
   repository_ctx.execute([
       opam_bin,
       "install",
@@ -76,6 +76,7 @@ def _ocaml_toolchain_impl(repository_ctx):
       "--root", OPAM_ROOT_DIR
   ], quiet = DEBUG_QUIET)
 
+  repository_ctx.report_progress("Installing opam packages..")
   [repository_ctx.execute([
       opam_bin,
       "install",
@@ -94,8 +95,7 @@ _ocaml_toolchain_repo = repository_rule(
         "_opam": attr.label(
             default = Label("@opam//:opam"),
             executable = True,
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
             cfg = "host",
         ),
         "opam_packages": attr.string_dict(default = {}),