From 7eac920985a67358dc0783dc7ab1a7c2a6df4471 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 13:26:55 +0100 Subject: [PATCH] move build python script to scripts folder --- Makefile | 4 ++-- echo_progress.py | 28 ---------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 echo_progress.py diff --git a/Makefile b/Makefile index a659f78ac..88c8e03a0 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ T := $(shell $(MAKE) $(MAKECMDGOALS) --no-print-directory \ ECHO="COUNTTHIS" | grep -c "COUNTTHIS") N := x C = $(words $N)$(eval N := x $N) -ECHO = python3 $(I)/echo_progress.py --stepno=$C --nsteps=$T +ECHO = python3 $(I)/scripts/echo_progress.py --stepno=$C --nsteps=$T endif # determine number of parallel compiles based on OS @@ -151,7 +151,7 @@ COMPILE.cpp = $(CXX) $(CXX_STANDARD) $(CXXFLAGS) $(DEPFLAGS) -c $< -o $@ .SILENT: $(OUTPUT) all: $(OUTPUT) - @$(ECHO) All done + @$(ECHO) Build complete. $(OUTPUT): $(OBJS) @mkdir -p $(@D) diff --git a/echo_progress.py b/echo_progress.py deleted file mode 100644 index 0a1a96529..000000000 --- a/echo_progress.py +++ /dev/null @@ -1,28 +0,0 @@ -""" -Print makefile progress -From https://stackoverflow.com/questions/451413/make-makefile-progress-indication -""" - -import argparse -import math -import sys - -def main(): - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument("--stepno", type=int, required=True) - parser.add_argument("--nsteps", type=int, required=True) - parser.add_argument("remainder", nargs=argparse.REMAINDER) - args = parser.parse_args() - - nchars = int(math.log(args.nsteps, 10)) + 1 - fmt_str = "[{:Xd}/{:Xd}]({:6.2f}%)".replace("X", str(nchars)) - progress = 100 * args.stepno / args.nsteps - sys.stdout.write(fmt_str.format(args.stepno, args.nsteps, progress)) - for item in args.remainder: - sys.stdout.write(" ") - sys.stdout.write(item) - sys.stdout.write("\n") - -if __name__ == "__main__": - main() - \ No newline at end of file