From 6fdc9a252ae547a17cd5e6b22811a5c6132205aa Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 28 Sep 2024 12:35:22 +0200 Subject: [PATCH] Update ab. --- build/_progress.py | 2 +- build/ab.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/_progress.py b/build/_progress.py index 68008107..c930f0b5 100644 --- a/build/_progress.py +++ b/build/_progress.py @@ -1,5 +1,5 @@ import sys -(_, current, max, *_) = sys.argv +(_, current, max) = sys.argv percent = int(100 * float(current) / float(max)) print(f"[{percent:>3}%]") diff --git a/build/ab.mk b/build/ab.mk index 2b0b6343..b3139e84 100644 --- a/build/ab.mk +++ b/build/ab.mk @@ -29,7 +29,7 @@ endif EXT ?= ifeq ($(PROGRESSINFO),) -rulecount := $(shell $(MAKE) -q $(OBJ)/build.mk PROGRESSINFO=1 && $(MAKE) -n $(MAKECMDGOALS) PROGRESSINFO=XXXPROGRESSINFOXXX | grep XXXPROGRESSINFOXXX | wc -l) +rulecount := $(shell $(MAKE) --no-print-directory -q $(OBJ)/build.mk PROGRESSINFO=1 && $(MAKE) -n $(MAKECMDGOALS) PROGRESSINFO=XXXPROGRESSINFOXXX | grep XXXPROGRESSINFOXXX | wc -l) ruleindex := 1 PROGRESSINFO = "$(shell $(PYTHON) build/_progress.py $(ruleindex) $(rulecount))$(eval ruleindex := $(shell expr $(ruleindex) + 1))" endif