From aa863523a6467e551eb749c0b73129b4b454259f Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 4 Apr 2023 21:19:27 +1000 Subject: [PATCH] Tools: remove dsdl_generated before building bootloader waf doesn't take care of this for us --- Tools/scripts/size_compare_branches.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tools/scripts/size_compare_branches.py b/Tools/scripts/size_compare_branches.py index 55f57761dc..092e718c79 100755 --- a/Tools/scripts/size_compare_branches.py +++ b/Tools/scripts/size_compare_branches.py @@ -298,6 +298,11 @@ class SizeCompareBranches(object): # need special configuration directive bootloader_waf_configure_args = copy.copy(waf_configure_args) bootloader_waf_configure_args.append('--bootloader') + # hopefully temporary hack so you can build bootloader + # after building other vehicles without a clean: + dsdl_generated_path = os.path.join('build', board, "modules", "DroneCAN", "libcanard", "dsdlc_generated") + self.progress("HACK: Removing (%s)" % dsdl_generated_path) + shutil.rmtree(dsdl_generated_path, ignore_errors=True) self.run_waf(bootloader_waf_configure_args) self.run_waf([v]) self.run_program("rsync", ["rsync", "-aP", "build/", outdir])