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

Make build with the new ab --- but the tests fail.

Browse Source
This commit is contained in:
David Given
2025-03-17 22:33:54 +01:00
parent 0f763fe06b
commit 15a69f6dcb
57 changed files with 220 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/protobuf.py
View File

@@ -31,7 +31,7 @@ def proto(self, name, srcs: Targets = [], deps: Targets = []):
]
)
dirs = sorted({"{dir}/" + dirname(f) for f in filenamesof(srcs)})
dirs = sorted({"$[dir]/" + dirname(f) for f in filenamesof(srcs)})
simplerule(
replaces=self,
ins=srcs,
@@ -39,9 +39,9 @@ def proto(self, name, srcs: Targets = [], deps: Targets = []):
deps=protodeps,
commands=(
["mkdir -p " + (" ".join(dirs))]
+ [f"$(CP) {f} {{dir}}/{f}" for f in filenamesof(srcs)]
+ [f"$(CP) {f} $[dir]/{f}" for f in filenamesof(srcs)]
+ [
"cd {dir} && "
"cd $[dir] && "
+ (
" ".join(
[
@@ -55,7 +55,7 @@ def proto(self, name, srcs: Targets = [], deps: Targets = []):
if descriptorlist
else []
)
+ ["{ins}"]
+ ["$[ins]"]
)
)
]
@@ -96,7 +96,7 @@ def protocc(self, name, srcs: Targets = [], deps: Targets = []):
outs=outs,
deps=protodeps,
commands=[
"cd {dir} && "
"cd $[dir] && "
+ (
" ".join(
[
@@ -146,8 +146,8 @@ def protojava(self, name, srcs: Targets = [], deps: Targets = []):
outs=[f"={self.localname}.srcjar"],
deps=srcs + deps,
commands=[
"mkdir -p {dir}/srcs",
"cd {dir} && "
"mkdir -p $[dir]/srcs",
"cd $[dir]/srcs && "
+ (
" ".join(
[
@@ -159,7 +159,7 @@ def protojava(self, name, srcs: Targets = [], deps: Targets = []):
+ protos
)
),
"$(JAR) cf {outs[0]} -C {dir}/srcs .",
"$(JAR) cf $[outs[0]] -C $[dir]/srcs .",
],
traits={"srcjar"},
label="PROTOJAVA",