From 4f310831b3d052e4c1bd536c33139c3d20235a0c Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sat, 26 Jul 2025 11:27:33 +0200
Subject: web: Remove unnecessary .gitignore

---
 web/.gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 web/.gitignore

(limited to 'web')

diff --git a/web/.gitignore b/web/.gitignore
deleted file mode 100644
index 07b5637..0000000
--- a/web/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-public
-.hugo_build.lock
-- 
cgit v1.2.3-70-g09d2


From aa5cd7b1e22f4165ad47d9042a0d6e8d1adee6e7 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sat, 26 Jul 2025 11:29:10 +0200
Subject: Move HTML copy to root Meson file

---
 meson.build     | 4 ++--
 web/meson.build | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 web/meson.build

(limited to 'web')

diff --git a/meson.build b/meson.build
index 8e2d91c..1840972 100644
--- a/meson.build
+++ b/meson.build
@@ -4,15 +4,15 @@ tar = find_program('tar', required : true)
 
 fs = import('fs')
 
+html = fs.copyfile(meson.current_source_dir() / 'web' / 'index.html')
 css = fs.copyfile(meson.current_source_dir() / 'simple.css' / 'simple.css')
 
 subdir('tools')
 subdir('fw')
 subdir('pcb')
-subdir('web')
 
 artifacts = [
-  index_html,
+  html,
   css,
   schematic,
   bom,
diff --git a/web/meson.build b/web/meson.build
deleted file mode 100644
index 19551a5..0000000
--- a/web/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-index_html = fs.copyfile(meson.current_source_dir() / 'index.html')
-- 
cgit v1.2.3-70-g09d2


From 73d1db5dddbae00477c3ebfb25dd64db0a2a8ac8 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sat, 26 Jul 2025 17:34:27 +0200
Subject: 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.
---
 meson.build    |  5 -----
 web/index.html | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'web')

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>
-- 
cgit v1.2.3-70-g09d2