From 834dacb9ffaead63b626489d22aab2f8263e9f16 Mon Sep 17 00:00:00 2001 From: xengineering Date: Fri, 25 Jul 2025 22:46:44 +0200 Subject: artifacts: Remove this folder This was just a trick to provide a folder in the build tree where only artifacts are stored. These artifacts are moved to the root of the build tree. This has the disadvantage that they are mixed with other files inside this folder. Nevertheless they should soon be added by Meson to the file archive used for deployment which solves this issue because it contains by definition only artifacts. --- README.md | 12 ------------ artifacts/meson.build | 23 ----------------------- meson.build | 26 ++++++++++++++++++++++++-- 3 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 artifacts/meson.build diff --git a/README.md b/README.md index a6dfe0a..c8b6b1a 100644 --- a/README.md +++ b/README.md @@ -27,15 +27,3 @@ The project is built with the Meson build system. meson setup build ninja -C build ``` - -The resulting artifacts can be listed with `tree`. - -``` -tree build/artifacts -``` - -These artifacts are organized as static website. It can be opened with Firefox. - -``` -firefox build/artifacts/index.html -``` diff --git a/artifacts/meson.build b/artifacts/meson.build deleted file mode 100644 index ac15661..0000000 --- a/artifacts/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -artifacts = [ - index_html, - css, - schematic, - bom, - simulation, - update_image, - factory_image, - kicad_pcb, -] - -foreach artifact : artifacts - custom_target( - output: [fs.name(artifact.full_path())], - command: [ - cp, - artifact.full_path(), - meson.current_build_dir(), - ], - depends: artifact, - build_by_default: true, - ) -endforeach diff --git a/meson.build b/meson.build index 9b7d7c1..dcc0fe2 100644 --- a/meson.build +++ b/meson.build @@ -4,10 +4,32 @@ cp = find_program('cp', required : true) fs = import('fs') -css = fs.copyfile(meson.current_source_dir() / 'simple.css' / 'simple.css') +fs.copyfile(meson.current_source_dir() / 'simple.css' / 'simple.css') subdir('tools') subdir('fw') subdir('pcb') subdir('web') -subdir('artifacts') + +artifacts = [ + index_html, + schematic, + bom, + simulation, + update_image, + factory_image, + kicad_pcb, +] + +foreach artifact : artifacts + custom_target( + output: [fs.name(artifact.full_path())], + command: [ + cp, + artifact.full_path(), + meson.current_build_dir(), + ], + depends: artifact, + build_by_default: true, + ) +endforeach -- cgit v1.2.3-70-g09d2