diff --git a/build/_progress.py b/build/_progress.py deleted file mode 100644 index 5b08e0e4..00000000 --- a/build/_progress.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -try: - (_, current, max) = sys.argv - percent = int(100 * float(current) / float(max)) - print(f"[{percent:>3}%]") -except: - pass diff --git a/build/ab.mk b/build/ab.mk index 6d168c1a..81057a83 100644 --- a/build/ab.mk +++ b/build/ab.mk @@ -50,7 +50,7 @@ EXT ?= ifeq ($(PROGRESSINFO),) 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))" +PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ruleindex) + 1))" endif PKG_CONFIG_HASHES = $(OBJ)/.pkg-config-hashes/target-$(word 1, $(shell $(PKG_CONFIG) --list-all | md5sum))