diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2019-03-25 11:55:54 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2019-03-25 12:58:59 +0100 |
| commit | 50ee4b871bc9d0076cabaa5d2ea4ad1ba7b8e15a (patch) | |
| tree | 05ee9273b41efa1d9268b32f829881c6f6d06eaa /src/ee/tools | |
| parent | b230198488ef670ed6e374e0d39d5f4e6ac07e8d (diff) | |
| download | ee-python-50ee4b871bc9d0076cabaa5d2ea4ad1ba7b8e15a.tar.gz ee-python-50ee4b871bc9d0076cabaa5d2ea4ad1ba7b8e15a.tar.bz2 ee-python-50ee4b871bc9d0076cabaa5d2ea4ad1ba7b8e15a.tar.xz ee-python-50ee4b871bc9d0076cabaa5d2ea4ad1ba7b8e15a.zip | |
ninja tool: changing to generate the files in the current directory.
build.ninja.j2: nits.
olinuxino: Improving parsing of part values.
Diffstat (limited to 'src/ee/tools')
| -rw-r--r-- | src/ee/tools/ninja.py | 7 | ||||
| -rw-r--r-- | src/ee/tools/templates/build.ninja.j2 | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ee/tools/ninja.py b/src/ee/tools/ninja.py index 0987004..f04b174 100644 --- a/src/ee/tools/ninja.py +++ b/src/ee/tools/ninja.py @@ -28,7 +28,7 @@ def ninja_path_filter(s: Union[Path, str, List[str]]) -> str: raise Exception("Unsupported argument type: {}".format(type(s))) -def parent_dir_filter(s: str) -> Path: +def parent_dir_filter(s: Union[str, Path]) -> Path: return Path(s).parent @@ -76,9 +76,10 @@ def generate(project: Project, sch_path: Path, kicad_bom_strategy: Optional[str] if gerber_zip is not None: params["gerber_zip"] = gerber_zip - build_ninja = sch_path.parent / "build.ninja" + # ee_dir = sch_path.parent / "ee" + ee_dir = Path(".") + build_ninja = ee_dir / "build.ninja" - ee_dir = sch_path.parent / "ee" parts_yaml_files = [path for path in ee_dir.iterdir() if str(path).endswith("-parts.yaml")] params["parts_yaml_files"] = parts_yaml_files diff --git a/src/ee/tools/templates/build.ninja.j2 b/src/ee/tools/templates/build.ninja.j2 index 9489aac..514e177 100644 --- a/src/ee/tools/templates/build.ninja.j2 +++ b/src/ee/tools/templates/build.ninja.j2 @@ -52,9 +52,8 @@ build {{ gerber_zip }}: kicad-gerber $pcb {%- endif %} build ee/sch.xml: kicad-make-bom $sch - strategy = {{ "--strategy " + kicad_bom_strategy if kicad_bom_strategy else "" }} - -{%- for d in distributors %} + strategy ={{ " --strategy " + kicad_bom_strategy if kicad_bom_strategy else "" }} +{% for d in distributors %} # Distributor {{ d }} build ee/{{ d }}/search-list.xml: part-create-distributor-search-list ee/sch.xml distributor = {{ d }} |