salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #785 from davidgiven/ab

Browse Source 
Update ab.
This commit is contained in:
David Given
2024-10-19 00:49:14 +02:00
committed by GitHub
parent d3ccb4b0d7 f3e7a4e439
commit 3c67a67ae7
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/ab.mk
View File

@@ -48,7 +48,10 @@ endif
EXT ?= EXT ?=
ifeq ($(PROGRESSINFO),) 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 := $(strip $(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 ruleindex := 1
PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ruleindex) + 1))" PROGRESSINFO = "[$(ruleindex)/$(rulecount)]$(eval ruleindex := $(shell expr $(ruleindex) + 1))"
endif endif

2
build/ab.py
View File

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

2
build/protobuf.py
View File

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