diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | fw/app/meson.build | 2 | ||||
| -rw-r--r-- | fw/btl/meson.build | 2 | ||||
| -rw-r--r-- | fw/sim/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pcb/meson.build | 4 | ||||
| -rw-r--r-- | web/hugo.toml | 2 | ||||
| -rw-r--r-- | web/index.html | 25 | ||||
| -rw-r--r-- | web/layouts/baseof.html | 12 | ||||
| -rw-r--r-- | web/layouts/home.html | 13 | ||||
| -rw-r--r-- | web/meson.build | 24 |
11 files changed, 37 insertions, 55 deletions
@@ -24,8 +24,8 @@ mkdir ~/mcuboot The project is built with the Meson build system. ``` -meson setup build -meson compile -C build +meson setup build --prefix / +ninja -C build meson install -C build --destdir artifacts ``` diff --git a/fw/app/meson.build b/fw/app/meson.build index 97c17f1..8d84209 100644 --- a/fw/app/meson.build +++ b/fw/app/meson.build @@ -41,5 +41,5 @@ application_signed = custom_target( build_by_default: true, depends: application, install: true, - install_dir: 'website/static', + install_dir: '/', ) diff --git a/fw/btl/meson.build b/fw/btl/meson.build index 4d80a58..c22ba3c 100644 --- a/fw/btl/meson.build +++ b/fw/btl/meson.build @@ -24,5 +24,5 @@ bootloader = custom_target('bootloader', ], build_by_default: true, install: true, - install_dir: 'website/static', + install_dir: '/', ) diff --git a/fw/sim/meson.build b/fw/sim/meson.build index a4dcb8a..7667f9b 100644 --- a/fw/sim/meson.build +++ b/fw/sim/meson.build @@ -23,5 +23,5 @@ simulation = custom_target( ], build_by_default: true, install: true, - install_dir: 'website/static', + install_dir: '/', ) diff --git a/meson.build b/meson.build index 85faf87..aaf873d 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ css = fs.copyfile( meson.current_source_dir() / 'simple.css' / 'simple.css', 'simple.css', install: true, - install_dir: 'website/static', + install_dir: '/', ) subdir('fw') diff --git a/pcb/meson.build b/pcb/meson.build index 7f8b85f..f320aae 100644 --- a/pcb/meson.build +++ b/pcb/meson.build @@ -20,7 +20,7 @@ schematic = custom_target('schematic', depend_files: schematic_files, build_by_default: true, install: true, - install_dir: 'website/static', + install_dir: '/', ) bom = custom_target('bom', @@ -38,5 +38,5 @@ bom = custom_target('bom', depend_files: schematic_files, build_by_default: true, install: true, - install_dir: 'website/static', + install_dir: '/', ) diff --git a/web/hugo.toml b/web/hugo.toml deleted file mode 100644 index 493ec29..0000000 --- a/web/hugo.toml +++ /dev/null @@ -1,2 +0,0 @@ -title = 'IoT contact' -disableKinds = ["taxonomy", "RSS", "sitemap"] diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..db5ee03 --- /dev/null +++ b/web/index.html @@ -0,0 +1,25 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="stylesheet" type="text/css" href="simple.css"> + <title>IoT contact</title> + </head> + <body> + <h1>IoT contact</h1> + + <h4>Printed circuit board</h4> + <ul> + <li><a href="schematic.pdf">schematic.pdf</a></li> + <li><a href="bill-of-materials.csv">bill-of-materials.csv</a></li> + </ul> + + <h4>Firmware</h4> + <ul> + <li><a href="application.signed.bin">application.signed.bin</a></li> + <li><a href="bootloader.bin">bootloader.bin</a></li> + <li><a href="simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li> + </ul> + </body> +</html> diff --git a/web/layouts/baseof.html b/web/layouts/baseof.html deleted file mode 100644 index 96d8e07..0000000 --- a/web/layouts/baseof.html +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" type="text/css" href="static/simple.css"> - <title>{{ .Site.Title }}</title> - </head> - <body> - {{ block "main" . }}{{end}} - </body> -</html> diff --git a/web/layouts/home.html b/web/layouts/home.html deleted file mode 100644 index 3bf37d9..0000000 --- a/web/layouts/home.html +++ /dev/null @@ -1,13 +0,0 @@ -{{- define "main" -}} -<h1>{{ .Site.Title }}</h1> -<ul> - <h4>Printed circuit board</h4> - <li><a href="static/schematic.pdf">schematic.pdf</a></li> - <li><a href="static/bill-of-materials.csv">bill-of-materials.csv</a></li> - - <h4>Firmware</h4> - <li><a href="static/application.signed.bin">application.signed.bin</a></li> - <li><a href="static/bootloader.bin">bootloader.bin</a></li> - <li><a href="static/simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li> -</ul> -{{- end -}} diff --git a/web/meson.build b/web/meson.build index da45440..f8c2024 100644 --- a/web/meson.build +++ b/web/meson.build @@ -1,22 +1,6 @@ -website = custom_target('website', - output: ['index.html'], - command: [ - 'hugo', - '--source', meson.current_source_dir(), - '--destination', meson.current_build_dir(), - ], - depend_files: [ - 'hugo.toml', - 'layouts/baseof.html', - 'layouts/home.html', - ], - depends: [ - schematic, - bom, - application, - bootloader, - ], - build_by_default: true, +website = fs.copyfile( + meson.current_source_dir() / 'index.html', + 'index.html', install: true, - install_dir: 'website', + install_dir: '/', ) |