From db02eb87ce5e955f1c970ea3ce88745e03f0bb74 Mon Sep 17 00:00:00 2001 From: xengineering Date: Thu, 3 Apr 2025 18:13:16 +0200 Subject: web: Add meson build system CMake has some disadvantages when building subprojects like with `ExternalProject`. Furthermore the language is sometimes hard to read, hard to write and not so much appreciated. This is a little test if meson might perform better. If successful this project might switch to meson for all parts except the Zephyr builds. --- web/meson.build | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 web/meson.build (limited to 'web/meson.build') diff --git a/web/meson.build b/web/meson.build new file mode 100644 index 0000000..3fcffed --- /dev/null +++ b/web/meson.build @@ -0,0 +1,16 @@ +custom_target('website', + output: ['public'], + command: [ + 'hugo', + '--source', + meson.current_source_dir(), + '--destination', + meson.current_build_dir() / 'public', + ], + depend_files: [ + 'hugo.toml', + 'layouts/baseof.html', + 'layouts/home.html', + ], + build_by_default: true, +) -- cgit v1.2.3-70-g09d2 From 34c0c109551c3a67bb89dcfbcd437a5ed812809f Mon Sep 17 00:00:00 2001 From: xengineering Date: Thu, 3 Apr 2025 21:45:55 +0200 Subject: web: Add simple.css to website This uses meson to copy the simple.css file to the build dir and references the CSS file in the HTML code. --- meson.build | 2 ++ web/content/meson.build | 5 +++++ web/layouts/baseof.html | 1 + web/meson.build | 9 +++++---- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 web/content/meson.build (limited to 'web/meson.build') diff --git a/meson.build b/meson.build index 537d067..494da4e 100644 --- a/meson.build +++ b/meson.build @@ -1,3 +1,5 @@ project('iot-contact') +css = meson.current_source_dir() / 'simple.css' / 'simple.css' + subdir('web') diff --git a/web/content/meson.build b/web/content/meson.build new file mode 100644 index 0000000..75d3120 --- /dev/null +++ b/web/content/meson.build @@ -0,0 +1,5 @@ +configure_file( + input: css, + output: 'simple.css', + copy: true, +) diff --git a/web/layouts/baseof.html b/web/layouts/baseof.html index 983e6e1..b52d039 100644 --- a/web/layouts/baseof.html +++ b/web/layouts/baseof.html @@ -3,6 +3,7 @@ + {{ .Site.Title }} diff --git a/web/meson.build b/web/meson.build index 3fcffed..20a4520 100644 --- a/web/meson.build +++ b/web/meson.build @@ -1,11 +1,12 @@ +subdir('content') + custom_target('website', output: ['public'], command: [ 'hugo', - '--source', - meson.current_source_dir(), - '--destination', - meson.current_build_dir() / 'public', + '--source', meson.current_source_dir(), + '--destination', meson.current_build_dir() / 'public', + '--contentDir', meson.current_build_dir() / 'content', ], depend_files: [ 'hugo.toml', -- cgit v1.2.3-70-g09d2 From ec8958e5ded76bd148e2cb4efbd22603555b93f5 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sat, 5 Apr 2025 10:21:36 +0200 Subject: web: Depend on schematic and bom targets This triggers a website rebuild when schematic files are updated. --- web/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'web/meson.build') diff --git a/web/meson.build b/web/meson.build index 20a4520..1e8989c 100644 --- a/web/meson.build +++ b/web/meson.build @@ -1,6 +1,6 @@ subdir('content') -custom_target('website', +website = custom_target('website', output: ['public'], command: [ 'hugo', @@ -13,5 +13,9 @@ custom_target('website', 'layouts/baseof.html', 'layouts/home.html', ], + depends: [ + schematic, + bom, + ], build_by_default: true, ) -- cgit v1.2.3-70-g09d2 From 061a67ea6e4a7fb9658fd3efc1c670eae5ff3eb6 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sat, 5 Apr 2025 10:36:38 +0200 Subject: Deploy schematic and BOM to website These important design files should be deployed with the website. --- pcb/meson.build | 8 ++++++-- web/content/copy.py | 9 +++++++++ web/content/meson.build | 24 ++++++++++++++++++++++++ web/layouts/home.html | 4 ++++ web/meson.build | 4 ++-- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100755 web/content/copy.py (limited to 'web/meson.build') diff --git a/pcb/meson.build b/pcb/meson.build index cd45a48..d74f8c3 100644 --- a/pcb/meson.build +++ b/pcb/meson.build @@ -7,6 +7,7 @@ schematic_files = [ 'processor.kicad_sch', ] +schematic_pdf = meson.current_build_dir() / 'schematic.pdf' schematic = custom_target('schematic', output: ['schematic.pdf'], command: [ @@ -14,13 +15,14 @@ schematic = custom_target('schematic', 'sch', 'export', 'pdf', - '--output', meson.current_build_dir() / 'schematic.pdf', + '--output', schematic_pdf, meson.current_source_dir() / 'iot-contact.kicad_sch', ], depend_files: schematic_files, build_by_default: true, ) +bom_csv = meson.current_build_dir() / 'bill-of-materials.csv' bom = custom_target('bom', output: ['bill-of-materials.csv'], command: [ @@ -30,9 +32,11 @@ bom = custom_target('bom', 'bom', '--fields', 'Reference,Description,Value,Footprint,Manufacturer,MPN,Datasheet', - '--output', meson.current_build_dir() / 'bill-of-materials.csv', + '--output', bom_csv, meson.current_source_dir() / 'iot-contact.kicad_sch', ], depend_files: schematic_files, build_by_default: true, ) + +pcb = meson.current_build_dir() diff --git a/web/content/copy.py b/web/content/copy.py new file mode 100755 index 0000000..0b06e6d --- /dev/null +++ b/web/content/copy.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 + + +import shutil +import sys + + +print(f"Copying {sys.argv[1]} to {sys.argv[2]}") +shutil.copyfile(sys.argv[1], sys.argv[2]) diff --git a/web/content/meson.build b/web/content/meson.build index 75d3120..5046982 100644 --- a/web/content/meson.build +++ b/web/content/meson.build @@ -3,3 +3,27 @@ configure_file( output: 'simple.css', copy: true, ) + +schematic_web = custom_target('schematic_web', + output: ['schematic.pdf'], + command: [ + 'copy.py', + schematic_pdf, + meson.current_build_dir() / 'schematic.pdf' + ], + depends: [ + schematic, + ], +) + +bom_web = custom_target('bom_web', + output: ['bill-of-materials.csv'], + command: [ + 'copy.py', + bom_csv, + meson.current_build_dir() / 'bill-of-materials.csv' + ], + depends: [ + bom, + ], +) diff --git a/web/layouts/home.html b/web/layouts/home.html index 5425ac9..dcd4a66 100644 --- a/web/layouts/home.html +++ b/web/layouts/home.html @@ -1,3 +1,7 @@ {{- define "main" -}}

{{- end -}} diff --git a/web/meson.build b/web/meson.build index 1e8989c..1c64394 100644 --- a/web/meson.build +++ b/web/meson.build @@ -14,8 +14,8 @@ website = custom_target('website', 'layouts/home.html', ], depends: [ - schematic, - bom, + schematic_web, + bom_web, ], build_by_default: true, ) -- cgit v1.2.3-70-g09d2 From 00189e737517f4470336d819d52327a037509493 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sat, 5 Apr 2025 15:28:04 +0200 Subject: web: Replace file copying by Meson installation This makes the build system code way less hacky and more modular. --- meson.build | 8 +++++++- pcb/meson.build | 12 ++++++------ web/content/copy.py | 9 --------- web/content/meson.build | 29 ----------------------------- web/layouts/baseof.html | 2 +- web/layouts/home.html | 4 ++-- web/meson.build | 13 ++++++------- 7 files changed, 22 insertions(+), 55 deletions(-) delete mode 100755 web/content/copy.py delete mode 100644 web/content/meson.build (limited to 'web/meson.build') diff --git a/meson.build b/meson.build index a0e6468..73206f4 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,12 @@ project('iot-contact') -css = meson.current_source_dir() / 'simple.css' / 'simple.css' +fs = import('fs') +css = fs.copyfile( + meson.current_source_dir() / 'simple.css' / 'simple.css', + 'simple.css', + install: true, + install_dir: 'website/static', +) subdir('pcb') subdir('web') diff --git a/pcb/meson.build b/pcb/meson.build index d74f8c3..7f8b85f 100644 --- a/pcb/meson.build +++ b/pcb/meson.build @@ -7,7 +7,6 @@ schematic_files = [ 'processor.kicad_sch', ] -schematic_pdf = meson.current_build_dir() / 'schematic.pdf' schematic = custom_target('schematic', output: ['schematic.pdf'], command: [ @@ -15,14 +14,15 @@ schematic = custom_target('schematic', 'sch', 'export', 'pdf', - '--output', schematic_pdf, + '--output', meson.current_build_dir() / 'schematic.pdf', meson.current_source_dir() / 'iot-contact.kicad_sch', ], depend_files: schematic_files, build_by_default: true, + install: true, + install_dir: 'website/static', ) -bom_csv = meson.current_build_dir() / 'bill-of-materials.csv' bom = custom_target('bom', output: ['bill-of-materials.csv'], command: [ @@ -32,11 +32,11 @@ bom = custom_target('bom', 'bom', '--fields', 'Reference,Description,Value,Footprint,Manufacturer,MPN,Datasheet', - '--output', bom_csv, + '--output', meson.current_build_dir() / 'bill-of-materials.csv', meson.current_source_dir() / 'iot-contact.kicad_sch', ], depend_files: schematic_files, build_by_default: true, + install: true, + install_dir: 'website/static', ) - -pcb = meson.current_build_dir() diff --git a/web/content/copy.py b/web/content/copy.py deleted file mode 100755 index 0b06e6d..0000000 --- a/web/content/copy.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python3 - - -import shutil -import sys - - -print(f"Copying {sys.argv[1]} to {sys.argv[2]}") -shutil.copyfile(sys.argv[1], sys.argv[2]) diff --git a/web/content/meson.build b/web/content/meson.build deleted file mode 100644 index 5046982..0000000 --- a/web/content/meson.build +++ /dev/null @@ -1,29 +0,0 @@ -configure_file( - input: css, - output: 'simple.css', - copy: true, -) - -schematic_web = custom_target('schematic_web', - output: ['schematic.pdf'], - command: [ - 'copy.py', - schematic_pdf, - meson.current_build_dir() / 'schematic.pdf' - ], - depends: [ - schematic, - ], -) - -bom_web = custom_target('bom_web', - output: ['bill-of-materials.csv'], - command: [ - 'copy.py', - bom_csv, - meson.current_build_dir() / 'bill-of-materials.csv' - ], - depends: [ - bom, - ], -) diff --git a/web/layouts/baseof.html b/web/layouts/baseof.html index b52d039..96d8e07 100644 --- a/web/layouts/baseof.html +++ b/web/layouts/baseof.html @@ -3,7 +3,7 @@ - + {{ .Site.Title }} diff --git a/web/layouts/home.html b/web/layouts/home.html index dcd4a66..bf534cf 100644 --- a/web/layouts/home.html +++ b/web/layouts/home.html @@ -1,7 +1,7 @@ {{- define "main" -}}

{{- end -}} diff --git a/web/meson.build b/web/meson.build index 1c64394..1526621 100644 --- a/web/meson.build +++ b/web/meson.build @@ -1,12 +1,9 @@ -subdir('content') - website = custom_target('website', - output: ['public'], + output: ['index.html'], command: [ 'hugo', '--source', meson.current_source_dir(), - '--destination', meson.current_build_dir() / 'public', - '--contentDir', meson.current_build_dir() / 'content', + '--destination', meson.current_build_dir(), ], depend_files: [ 'hugo.toml', @@ -14,8 +11,10 @@ website = custom_target('website', 'layouts/home.html', ], depends: [ - schematic_web, - bom_web, + schematic, + bom, ], build_by_default: true, + install: true, + install_dir: 'website', ) -- cgit v1.2.3-70-g09d2 From 5376b67a9df63d2b30cac415cb827e6b4c1674e9 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 6 Apr 2025 14:24:06 +0200 Subject: Build bootloader and add to website Meson makes this relatively easy. The current approach is nevertheless a bit hacky. For the first attempt it is still way better than CMake ExternalProject. --- fw/btl/build.py | 29 +++++++++++++++++++++++++++++ fw/btl/meson.build | 11 +++++++++++ web/layouts/home.html | 1 + web/meson.build | 1 + 4 files changed, 42 insertions(+) create mode 100755 fw/btl/build.py (limited to 'web/meson.build') diff --git a/fw/btl/build.py b/fw/btl/build.py new file mode 100755 index 0000000..6478701 --- /dev/null +++ b/fw/btl/build.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 + + +import multiprocessing +import shutil +import subprocess +import sys +import pathlib + + +build_tree = pathlib.Path(sys.argv[1]) +output_dir = build_tree.parent + + +subprocess.run( + [ + "make", + f"-j{multiprocessing.cpu_count()}", + "-C", + f"{str(build_tree)}", + ], + shell=False, + check=True, +) + +shutil.copy( + build_tree / "zephyr" / "zephyr.bin", + output_dir / "bootloader.bin" +) diff --git a/fw/btl/meson.build b/fw/btl/meson.build index b783191..37c8c25 100644 --- a/fw/btl/meson.build +++ b/fw/btl/meson.build @@ -12,3 +12,14 @@ bootloader_project = external_project.add_project('configure.py', ], verbose: true, ) + +bootloader = custom_target('bootloader', + output: ['bootloader.bin'], + command: [ + meson.current_source_dir() / 'build.py', + meson.current_build_dir() / 'build', + ], + build_by_default: true, + install: true, + install_dir: 'website/static', +) diff --git a/web/layouts/home.html b/web/layouts/home.html index bf534cf..4f1f7fc 100644 --- a/web/layouts/home.html +++ b/web/layouts/home.html @@ -3,5 +3,6 @@

{{- end -}} diff --git a/web/meson.build b/web/meson.build index 1526621..270b7c3 100644 --- a/web/meson.build +++ b/web/meson.build @@ -13,6 +13,7 @@ website = custom_target('website', depends: [ schematic, bom, + bootloader, ], build_by_default: true, install: true, -- cgit v1.2.3-70-g09d2 From 8350421e659e9273a94debdd6f29cd80979a63f1 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 6 Apr 2025 18:04:25 +0200 Subject: fw: app: Build with Meson --- fw/app/meson.build | 25 +++++++++++++++++++++++++ fw/meson.build | 1 + web/layouts/home.html | 1 + web/meson.build | 1 + 4 files changed, 28 insertions(+) create mode 100644 fw/app/meson.build (limited to 'web/meson.build') diff --git a/fw/app/meson.build b/fw/app/meson.build new file mode 100644 index 0000000..7f35ebb --- /dev/null +++ b/fw/app/meson.build @@ -0,0 +1,25 @@ +external_project = import('unstable-external_project') + +external_project.add_project( + configure_zephyr, + configure_options: [ + '--source-tree', meson.current_source_dir(), + '--build-tree', meson.current_build_dir() / 'build', + '--board', board, + '--zephyr-base', zephyr, + '--zephyr-modules', ';'.join(zephyr_modules), + ], + verbose: true, +) + +application = custom_target('application', + output: ['application.bin'], + command: [ + build_zephyr, + '--build-tree', meson.current_build_dir() / 'build', + '--target-name', 'application.bin', + ], + build_by_default: true, + install: true, + install_dir: 'website/static', +) diff --git a/fw/meson.build b/fw/meson.build index 7f9bead..492465e 100644 --- a/fw/meson.build +++ b/fw/meson.build @@ -4,4 +4,5 @@ fs = import('fs') signing_key = fs.expanduser('~') / 'mcuboot' / 'key.pem' subdir('rtos') +subdir('app') subdir('btl') diff --git a/web/layouts/home.html b/web/layouts/home.html index 4f1f7fc..fe40af2 100644 --- a/web/layouts/home.html +++ b/web/layouts/home.html @@ -3,6 +3,7 @@

{{- end -}} diff --git a/web/meson.build b/web/meson.build index 270b7c3..da45440 100644 --- a/web/meson.build +++ b/web/meson.build @@ -13,6 +13,7 @@ website = custom_target('website', depends: [ schematic, bom, + application, bootloader, ], build_by_default: true, -- cgit v1.2.3-70-g09d2