From 16cb739ae49a046de175b7eb65ce9ebbecf4f3e7 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Mon, 2 Jan 2023 09:45:30 -0300 Subject: [PATCH] [Copy_Files][Fixed] Problems on KiCad 5 - No 3rd party dir Fixes #357 --- CHANGELOG.md | 2 ++ kibot/out_copy_files.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24c9d923..e453d860 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - iBoM: - Variant changes to the *.Fab weren't exported. Now all 2D variant stuff is applied before calling iBoM (#350) +- Copy_Files: + - Problems on KiCad 5 (no 3rd party dir) (#357) ## [1.5.1] - 2022-12-16 ### Fixed diff --git a/kibot/out_copy_files.py b/kibot/out_copy_files.py index 32c25522..9b58d732 100644 --- a/kibot/out_copy_files.py +++ b/kibot/out_copy_files.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 Salvador E. Tropea -# Copyright (c) 2022 Instituto Nacional de Tecnología Industrial +# Copyright (c) 2022-2023 Salvador E. Tropea +# Copyright (c) 2022-2023 Instituto Nacional de Tecnología Industrial # License: GPL-3.0 # Project: KiBot (formerly KiPlot) import fnmatch @@ -157,9 +157,12 @@ class Copy_FilesOptions(Base3DOptions): files = [] src_dir_cwd = os.getcwd() src_dir_outdir = self.expand_filename_sch(GS.out_dir) - self.rel_dirs = [os.path.normpath(os.path.join(GS.pcb_dir, KiConf.models_3d_dir)), - os.path.normpath(os.path.join(GS.pcb_dir, KiConf.party_3rd_dir)), - GS.pcb_dir] + self.rel_dirs = [] + if KiConf.models_3d_dir: + self.rel_dirs.append(os.path.normpath(os.path.join(GS.pcb_dir, KiConf.models_3d_dir))) + if KiConf.party_3rd_dir: + self.rel_dirs.append(os.path.normpath(os.path.join(GS.pcb_dir, KiConf.party_3rd_dir))) + self.rel_dirs.append(GS.pcb_dir) for f in self.files: from_outdir = False if f.source_type == 'out_files' or f.source_type == 'output':