summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <me@xengineering.eu>2025-07-26 17:34:27 +0200
committerxengineering <me@xengineering.eu>2025-07-26 19:02:33 +0200
commit73d1db5dddbae00477c3ebfb25dd64db0a2a8ac8 (patch)
treee43846e70d4231a8f5f901afd98bb2afcdfee36e
parentc2e22305d9af9c10f7f5e168088d62af360c8c2d (diff)
downloadiot-contact-73d1db5dddbae00477c3ebfb25dd64db0a2a8ac8.tar
iot-contact-73d1db5dddbae00477c3ebfb25dd64db0a2a8ac8.tar.zst
iot-contact-73d1db5dddbae00477c3ebfb25dd64db0a2a8ac8.zip
Same structure for source, build and deploy trees
This commit removes the path transformations apart from project-prefixing from the deploy tree / artifact file archive. This gives the source tree, build tree and deploy tree the same directory hierarchy. The advantages are simple implementation and maintenance and a common structure for all parties (users, developers, producers, ...). The disadvantage is obviously that the deploy tree structure cannot be customized on its own. At least for now the approach "there is one right structure to rule them all" is taken.
-rw-r--r--meson.build5
-rw-r--r--web/index.html12
2 files changed, 6 insertions, 11 deletions
diff --git a/meson.build b/meson.build
index 1840972..4548f4d 100644
--- a/meson.build
+++ b/meson.build
@@ -27,11 +27,6 @@ custom_target(
command: [
tar,
'--zstd',
- '--transform=s|^fw/app/||',
- '--transform=s|^fw/sim/||',
- '--transform=s|^fw/||',
- '--transform=s|^pcb/||',
- '--transform=s|^web/||',
'--transform=s|^|' + meson.project_name() + '/|',
'-cf', '@OUTPUT@',
artifacts,
diff --git a/web/index.html b/web/index.html
index f8d76ed..d353cb7 100644
--- a/web/index.html
+++ b/web/index.html
@@ -12,16 +12,16 @@
<h4>Printed circuit board</h4>
<ul>
- <li><a href="iot-contact.kicad_pcb">iot-contact.kicad_pcb</a></li>
- <li><a href="schematic.pdf">schematic.pdf</a></li>
- <li><a href="bill-of-materials.csv">bill-of-materials.csv</a></li>
+ <li><a href="pcb/iot-contact.kicad_pcb">iot-contact.kicad_pcb</a></li>
+ <li><a href="pcb/schematic.pdf">schematic.pdf</a></li>
+ <li><a href="pcb/bill-of-materials.csv">bill-of-materials.csv</a></li>
</ul>
<h4>Firmware</h4>
<ul>
- <li><a href="factory-image.bin">factory-image.bin</a></li>
- <li><a href="update-image.bin">update-image.bin</a></li>
- <li><a href="simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>
+ <li><a href="fw/factory-image.bin">factory-image.bin</a></li>
+ <li><a href="fw/app/update-image.bin">update-image.bin</a></li>
+ <li><a href="fw/sim/simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>
</ul>
</main>
</body>