From d20d7e5d5cad69719584d61c7b8e3d59e725a02f Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Fri, 29 Jan 2021 10:36:33 -0300 Subject: [PATCH] Fixed STEP dependencies generation. --- kibot/kiplot.py | 3 ++- kibot/out_step.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kibot/kiplot.py b/kibot/kiplot.py index 10beb378..3bcbe64e 100644 --- a/kibot/kiplot.py +++ b/kibot/kiplot.py @@ -292,7 +292,8 @@ def generate_outputs(outputs, target, invert, skip_pre): def adapt_file_name(name): - name = os.path.relpath(name) + if not name.startswith('/usr'): + name = os.path.relpath(name) name = name.replace(' ', r'\ ') if '$' in name: logger.warning(W_WRONGCHAR+'Wrong character in file name `{}`'.format(name)) diff --git a/kibot/out_step.py b/kibot/out_step.py index 14ab8d00..a6209177 100644 --- a/kibot/out_step.py +++ b/kibot/out_step.py @@ -153,7 +153,7 @@ class STEPOptions(VariantOptions): full_name = KiConf.expand_env(m3d.m_Filename) if os.path.isfile(full_name): models.add(full_name) - return models.keys() + return list(models) def save_board(self, dir): """ Save the PCB to a temporal file """ @@ -200,12 +200,12 @@ class STEPOptions(VariantOptions): return fname def get_targets(self, parent, out_dir): - return [self.expand_filename_sch(out_dir, self.output, '3D', 'step')] + return [self.expand_filename(out_dir, self.output, '3D', 'step')] def run(self, output_dir): super().run(output_dir) # Output file name - output = self.expand_filename(output_dir, self.output, '3D', 'step') + output = self.get_targets(None, output_dir)[0] # Make units explicit if self.metric_units: units = 'mm'