diff options
| author | xengineering <me@xengineering.eu> | 2025-04-05 15:28:04 +0200 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-04-05 15:28:04 +0200 |
| commit | 00189e737517f4470336d819d52327a037509493 (patch) | |
| tree | 8f7d2f3e616a89b807cf2986ecc6ee6876f99392 | |
| parent | 061a67ea6e4a7fb9658fd3efc1c670eae5ff3eb6 (diff) | |
| download | iot-contact-00189e737517f4470336d819d52327a037509493.tar iot-contact-00189e737517f4470336d819d52327a037509493.tar.zst iot-contact-00189e737517f4470336d819d52327a037509493.zip | |
web: Replace file copying by Meson installation
This makes the build system code way less hacky and more modular.
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | pcb/meson.build | 12 | ||||
| -rwxr-xr-x | web/content/copy.py | 9 | ||||
| -rw-r--r-- | web/content/meson.build | 29 | ||||
| -rw-r--r-- | web/layouts/baseof.html | 2 | ||||
| -rw-r--r-- | web/layouts/home.html | 4 | ||||
| -rw-r--r-- | web/meson.build | 13 |
7 files changed, 22 insertions, 55 deletions
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 @@ <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" type="text/css" href="simple.css"> + <link rel="stylesheet" type="text/css" href="static/simple.css"> <title>{{ .Site.Title }}</title> </head> <body> 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" -}} <h1>{{ .Site.Title }}</h1> <ul> - <li><a href="bill-of-materials.csv">bill-of-materials.csv</a></li> - <li><a href="schematic.pdf">schematic.pdf</a></li> + <li><a href="static/bill-of-materials.csv">bill-of-materials.csv</a></li> + <li><a href="static/schematic.pdf">schematic.pdf</a></li> </ul> {{- 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', ) |