Merge pull request #92 from lucidsoftware/jjudd-progress-messages

Add progress_message to actions that currently do not have one

Author: jjudd

rules/private/phases/phase_binary_deployjar.bzl

@@ -22,6 +22,6 @@ def phase_binary_deployjar(ctx, g):
         ),
         main_class = main_class,
         output = ctx.outputs.deploy_jar,
-        progress_message = "scala deployable %s" % ctx.label,
+        progress_message = "Creating Scala deploy jar %{label}",
         compression = True,
     )

rules/private/phases/phase_bootstrap_compile.bzl

@@ -124,7 +124,8 @@ def phase_bootstrap_compile(ctx, g):
             "supports-path-mapping": "1",
         },
         inputs = inputs,
-        mnemonic = "BootstrapScalacompile",
+        mnemonic = "BootstrapScalaCompile",
+        progress_message = "Bootstrap Compiling Scala %{label}",
         outputs = [g.classpaths.jar, tmp],
         toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
         tools = [ctx.executable._jar_creator],

rules/private/phases/phase_classpaths.bzl

@@ -39,7 +39,7 @@ def phase_classpaths(ctx, g):
                 ctx,
                 inputs = deps,
                 output = plugin_singlejar,
-                progress_message = "singlejar scalac plugin %s" % plugin.label.name,
+                progress_message = "Creating SingleJar for Scalac plugin %{label}",
             )
             actual_plugins.append(plugin_singlejar)
 

rules/private/phases/phase_coverage_jacoco.bzl

@@ -39,6 +39,7 @@ def phase_coverage_jacoco(ctx, g):
         },
         inputs = [in_out_pair[0] for in_out_pair in in_out_pairs],
         mnemonic = "JacocoInstrumenter",
+        progress_message = "Analyzing Scala code coverage with JaCoCo %{label}",
         outputs = [in_out_pair[1] for in_out_pair in in_out_pairs],
         toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
     )

rules/private/phases/phase_resources.bzl

@@ -23,7 +23,7 @@ def phase_resources(ctx, g):
             ctx,
             inputs = [],
             output = resource_jar,
-            progress_message = "singlejar resources %s" % ctx.label.name,
+            progress_message = "Creating SingleJar for resources %{label}",
             resources = {
                 _resources_make_path(file, ctx.attr.resource_strip_prefix): file
                 for file in ctx.files.resources

rules/private/phases/phase_singlejar.bzl

@@ -26,4 +26,9 @@ def phase_singlejar(ctx, g):
             jar = getattr(v, "jar")
             inputs.append(jar)
 
-    _action_singlejar(ctx, inputs, ctx.outputs.jar)
+    _action_singlejar(
+        ctx,
+        inputs = inputs,
+        output = ctx.outputs.jar,
+        progress_message = "Creating SingleJar %{label}",
+    )

rules/private/phases/phase_zinc_compile.bzl

@@ -106,6 +106,7 @@ def phase_zinc_compile(ctx, g):
         inputs = inputs,
         mnemonic = "ScalaCompile",
         outputs = outputs,
+        progress_message = "Compiling Scala %{label}",
         toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
     )
 

rules/private/phases/phase_zinc_depscheck.bzl

@@ -52,6 +52,7 @@ def phase_zinc_depscheck(ctx, g):
             },
             inputs = [g.compile.used],
             mnemonic = "ScalaCheckDeps",
+            progress_message = "Checking Scala dependencies %{label}",
             outputs = [deps_check],
             toolchain = "@rules_scala_annex//rules/scala:toolchain_type",
         )

rules/scala/private/doc.bzl

@@ -66,6 +66,7 @@ def scaladoc_implementation(ctx):
             transitive = [classpath, compiler_classpath],
         ),
         mnemonic = "ScalaDoc",
+        progress_message = "Generating Scaladoc %{label}",
         outputs = [html, tmp],
         toolchain = None,
     )

rules/scala_proto/private/core.bzl

@@ -53,7 +53,7 @@ def scala_proto_library_implementation(ctx):
         inputs = depset(direct = [], transitive = [transitive_sources]),
         mnemonic = "ScalaProtoCompile",
         outputs = [gendir],
-        progress_message = "Compiling %{label} protobuf into Scala source",
+        progress_message = "Compiling protobuf into Scala source %{label}",
         toolchain = "@rules_scala_annex//rules/scala_proto:compiler_toolchain_type",
         tools = [compiler.protoc],
     )
@@ -73,7 +73,7 @@ def scala_proto_library_implementation(ctx):
         inputs = [gendir],
         mnemonic = "SrcJar",
         outputs = [srcjar],
-        progress_message = "Bundling compiled Scala into srcjar for %{label}",
+        progress_message = "Bundling compiled Scala into srcjar %{label}",
         toolchain = None,
         tools = [ctx.executable._zipper],
     )