diff options
| author | xengineering <me@xengineering.eu> | 2025-07-25 22:46:44 +0200 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-07-26 19:01:09 +0200 |
| commit | 834dacb9ffaead63b626489d22aab2f8263e9f16 (patch) | |
| tree | 25413e0be2d1d463bbe307b107f3d32aca5cea9e | |
| parent | db83efd4d439ecd100c9b2400c00a68597444d89 (diff) | |
| download | iot-contact-834dacb9ffaead63b626489d22aab2f8263e9f16.tar iot-contact-834dacb9ffaead63b626489d22aab2f8263e9f16.tar.zst iot-contact-834dacb9ffaead63b626489d22aab2f8263e9f16.zip | |
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.
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | artifacts/meson.build | 23 | ||||
| -rw-r--r-- | meson.build | 26 |
3 files changed, 24 insertions, 37 deletions
@@ -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 |