From a9ca2f3f1171aee46ea2fd530b43576278c03e4d Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Sat, 18 Mar 2023 18:41:15 -0300 Subject: [PATCH] [Makefile][Fixed] don't skip all preflights on each run - Just the ones we generate as targets. Fixes #405 --- CHANGELOG.md | 3 +++ kibot/kiplot.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c6361af..76b0cce2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [1.6.2] - UNRELEASED +### Fixed +- Makefile: don't skip all preflights on each run, just the ones we generate + as targets. (#405) ## [1.6.1] - 2023-03-16 diff --git a/kibot/kiplot.py b/kibot/kiplot.py index b2ec599e..cb202ceb 100644 --- a/kibot/kiplot.py +++ b/kibot/kiplot.py @@ -657,6 +657,7 @@ def generate_makefile(makefile, cfg_file, outputs, kibot_sys=False): else: kibot_cmd = '\t@$(KIBOT_CMD)' log_action = ' 2>> $(LOGFILE)' + skip_all = ','.join(is_pre) for name, dep in dependencies.items(): if name in comments: f.write('# '+comments[name]+'\n') @@ -666,7 +667,7 @@ def generate_makefile(makefile, cfg_file, outputs, kibot_sys=False): skip = filter(lambda n: n != name, is_pre) f.write('{} -s {} -i{}\n\n'.format(kibot_cmd, ','.join(skip), log_action)) else: - f.write('{} -s all "{}"{}\n\n'.format(kibot_cmd, ori_names[name], log_action)) + f.write('{} -s {} "{}"{}\n\n'.format(kibot_cmd, skip_all, ori_names[name], log_action)) # Mark all outputs as PHONY f.write('.PHONY: '+' '.join(extra_targets+list(targets.keys()))+'\n')