From 46b537fb86e029978d9a1f8aa5d07ec2949ea7a1 Mon Sep 17 00:00:00 2001 From: xengineering Date: Wed, 7 May 2025 19:52:37 +0200 Subject: WIP: Remove installation step TODO: Check if the bootloader install target is still usable. Using the installation step to copy selected artifacts into on folder was anyway a hack. This commit shows that the complexity can be reduced by adding copy targets. The `build/artifacts` folder contains the selected artifacts, they are always up to date, the user does not have to call the install step separately and the target definitions do not require install-related keyword arguments. --- fw/app/meson.build | 4 ---- fw/btl/meson.build | 4 +--- fw/sim/meson.build | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'fw') diff --git a/fw/app/meson.build b/fw/app/meson.build index ddd5aa6..0aefcb3 100644 --- a/fw/app/meson.build +++ b/fw/app/meson.build @@ -15,7 +15,6 @@ external_project.add_project( ) application = custom_target( - 'application', output: ['application.bin'], command: [ build_zephyr, @@ -26,7 +25,6 @@ application = custom_target( ) application_signed = custom_target( - 'application_signed', output: ['application.signed.bin'], command: [ imgtool, @@ -40,8 +38,6 @@ application_signed = custom_target( ], build_by_default: true, depends: application, - install: true, - install_dir: '/', ) flash_application = custom_target( diff --git a/fw/btl/meson.build b/fw/btl/meson.build index 8ca1eb3..b86c9c9 100644 --- a/fw/btl/meson.build +++ b/fw/btl/meson.build @@ -14,7 +14,7 @@ external_project.add_project( verbose: true, ) -bootloader = custom_target('bootloader', +bootloader = custom_target( output: ['bootloader.bin'], command: [ build_zephyr, @@ -23,8 +23,6 @@ bootloader = custom_target('bootloader', '--target-name', 'bootloader.bin', ], build_by_default: true, - install: true, - install_dir: '/', ) flash_bootloader = custom_target( diff --git a/fw/sim/meson.build b/fw/sim/meson.build index 7667f9b..5edcad9 100644 --- a/fw/sim/meson.build +++ b/fw/sim/meson.build @@ -13,7 +13,6 @@ external_project.add_project( ) simulation = custom_target( - 'simulation', output: ['simulation-linux-amd64.exe'], command: [ build_zephyr, @@ -22,6 +21,4 @@ simulation = custom_target( '--target-name', 'simulation-linux-amd64.exe', ], build_by_default: true, - install: true, - install_dir: '/', ) -- cgit v1.2.3-70-g09d2