Update ab.

davidgiven · Oct 18, 2024 · fb5bb87 · fb5bb87
1 parent d096d77
commit fb5bb87
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build/ab.mk b/build/ab.mk
@@ -48,7 +48,10 @@ endif
 EXT ?=
 
 ifeq ($(PROGRESSINFO),)
-rulecount := $(strip $(shell $(MAKE) --no-print-directory -q $(OBJ)/build.mk PROGRESSINFO=1 && $(MAKE) --no-print-directory -n $(MAKECMDGOALS) PROGRESSINFO=XXXPROGRESSINFOXXX | grep XXXPROGRESSINFOXXX | wc -l))
+# The first make invocation here has to have its output discarded or else it
+# produces spurious 'Leaving directory' messages... don't know why.
+rulecount := $(shell $(MAKE) --no-print-directory -q $(OBJ)/build.mk PROGRESSINFO=1 > /dev/null \
+	&& $(MAKE) --no-print-directory -n $(MAKECMDGOALS) PROGRESSINFO=XXXPROGRESSINFOXXX | grep XXXPROGRESSINFOXXX | wc -l)
 ruleindex := 1
 PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ruleindex) + 1))"
 endif

diff --git a/build/ab.py b/build/ab.py
@@ -423,7 +423,7 @@ def emit_rule(name, ins, outs, cmds=[], label=None):
         emit(*fouts, "&:" if len(fouts) > 1 else ":", *fins, "\x01", into=lines)
 
         if label:
-            emit("\t$(hide)", "$(ECHO) $(PROGRESSINFO) ", label, into=lines)
+            emit("\t$(hide)", "$(ECHO) $(PROGRESSINFO)", label, into=lines)
         for c in cmds:
             emit("\t$(hide)", c, into=lines)
     else:

diff --git a/build/protobuf.py b/build/protobuf.py
@@ -144,7 +144,7 @@ def protojava(self, name, srcs: Targets = [], deps: Targets = []):
         cwd=self.cwd,
         ins=protos,
         outs=[f"={self.localname}.srcjar"],
-        deps=deps,
+        deps=srcs + deps,
         commands=[
             "mkdir -p {dir}/srcs",
             "cd {dir} && "