CuteEngineering/cutekit
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make sure cins and cdefs are always in the same order

Browse source
This commit is contained in:
Sleepy Monax 2023-12-21 15:56:09 +01:00
parent f810003ab9
commit 00e35a2d0f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cutekit/builder.py
View file

@ -103,7 +103,7 @@ def _computeCinc(scope: TargetScope) -> str:
elif c.type == model.Kind.LIB:
res.add(str(Path(c.dirname()).parent))
return " ".join(set(map(lambda i: f"-I{i}", res)))
return " ".join(sorted(map(lambda i: f"-I{i}", res)))
@var("cdefs")
@ -121,7 +121,7 @@ def _computeCdef(scope: TargetScope) -> str:
res.add(f"-D__ck_{sanatize(k)}_{sanatize(str(v))}__")
res.add(f"-D__ck_{sanatize(k)}_value={str(v)}")
return " ".join(res)
return " ".join(sorted(res))
def buildpath(scope: ComponentScope, path) -> Path:
@ -306,9 +306,9 @@ def build(
shell.mkdir(scope.target.builddir)
ninjaPath = os.path.join(scope.target.builddir, "build.ninja")
if not os.path.exists(ninjaPath):
with open(ninjaPath, "w") as f:
gen(f, scope)
# if not os.path.exists(ninjaPath):
with open(ninjaPath, "w") as f:
gen(f, scope)
if components is None:
all = True