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

Allow putting packages in subdirectories.

Browse source
This commit is contained in:
Nicolas Van Bossuyt 2022-08-11 13:41:06 +02:00
parent 1f5cddb55f
commit 0bf7d35168
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
osdk/manifests.py
View file

@ -1,5 +1,6 @@
import os import os
import copy import copy
from pathlib import Path
from . import utils from . import utils
@ -160,12 +161,18 @@ def cincludes(manifests: dict) -> str:
for key in manifests: for key in manifests:
item = manifests[key] item = manifests[key]
if item["enabled"] and "root-include" in item: if item["enabled"]:
include_paths.append(item["dir"]) if "root-include" in item:
include_paths.append(item["dir"])
else:
include_paths.append(str(Path(item["dir"]).parent))
if len(include_paths) == 0: if len(include_paths) == 0:
return "" return ""
# remove duplicates
include_paths = utils.stripDups(include_paths)
return " -I" + " -I".join(include_paths) return " -I" + " -I".join(include_paths)