From 944ac97ba4ee5cb147e83daabc48ab4f1c8f472b Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sat, 19 Oct 2024 16:44:02 +0200
Subject: [PATCH] Move layout proto into config.

---
 lib/build.py                      | 11 -----------
 lib/config/build.py               | 31 +++++++++++++++++++++----------
 lib/config/config.proto           |  2 +-
 lib/{ => config}/layout.proto     |  0
 lib/imagereader/imgimagereader.cc |  2 +-
 lib/imagewriter/imgimagewriter.cc |  2 +-
 lib/vfs/build.py                  |  4 ++--
 lib/vfs/vfs.cc                    |  2 +-
 lib/vfs/vfs.proto                 |  2 +-
 9 files changed, 28 insertions(+), 28 deletions(-)
 rename lib/{ => config}/layout.proto (100%)

diff --git a/lib/build.py b/lib/build.py
index 1f94ee998..9f6ec56e0 100644
--- a/lib/build.py
+++ b/lib/build.py
@@ -5,14 +5,3 @@
 protocc(
     name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"]
 )
-
-proto(
-    name="layout_proto",
-    srcs=["./layout.proto"],
-    deps=[".+common_proto", "lib/external+fl2_proto"],
-)
-protocc(
-    name="layout_proto_lib",
-    srcs=[".+layout_proto"],
-    deps=[".+common_proto_lib", "lib/external+fl2_proto_lib"],
-)
diff --git a/lib/config/build.py b/lib/config/build.py
index ab4c37f69..1a8f20baf 100644
--- a/lib/config/build.py
+++ b/lib/config/build.py
@@ -4,34 +4,45 @@
 proto(
     name="drive_proto",
     srcs=["./drive.proto"],
-    deps=["lib+common_proto", "lib/external+fl2_proto", "lib+layout_proto"],
+    deps=["lib+common_proto", "lib/external+fl2_proto", ".+layout_proto"],
 )
-
 protocc(
     name="drive_proto_lib",
     srcs=[".+drive_proto"],
     deps=[
+        ".+layout_proto_lib",
         "lib+common_proto_lib",
         "lib/external+fl2_proto_lib",
-        "lib+layout_proto_lib",
     ],
 )
+
+proto(
+    name="layout_proto",
+    srcs=["./layout.proto"],
+    deps=["lib+common_proto", "lib/external+fl2_proto"],
+)
+protocc(
+    name="layout_proto_lib",
+    srcs=[".+layout_proto"],
+    deps=["lib+common_proto_lib", "lib/external+fl2_proto_lib"],
+)
+
 proto(
     name="proto",
     srcs=["./config.proto"],
     deps=[
-        "lib+common_proto",
-        "lib+layout_proto",
         ".+drive_proto",
+        ".+layout_proto",
+        "lib+common_proto",
+        "lib/decoders+proto",
+        "lib/encoders+proto",
         "lib/external+fl2_proto",
-        "lib/fluxsource+proto",
         "lib/fluxsink+proto",
-        "lib/vfs+proto",
-        "lib/usb+proto",
-        "lib/encoders+proto",
-        "lib/decoders+proto",
+        "lib/fluxsource+proto",
         "lib/imagereader+proto",
         "lib/imagewriter+proto",
+        "lib/usb+proto",
+        "lib/vfs+proto",
     ],
 )
 
diff --git a/lib/config/config.proto b/lib/config/config.proto
index cfe414a4a..d1f8a12da 100644
--- a/lib/config/config.proto
+++ b/lib/config/config.proto
@@ -10,7 +10,7 @@ import "lib/usb/usb.proto";
 import "lib/vfs/vfs.proto";
 import "lib/config/drive.proto";
 import "lib/common.proto";
-import "lib/layout.proto";
+import "lib/config/layout.proto";
 
 enum SupportStatus
 {
diff --git a/lib/layout.proto b/lib/config/layout.proto
similarity index 100%
rename from lib/layout.proto
rename to lib/config/layout.proto
diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc
index ac76e2207..42e747b23 100644
--- a/lib/imagereader/imgimagereader.cc
+++ b/lib/imagereader/imgimagereader.cc
@@ -6,7 +6,7 @@
 #include "lib/data/image.h"
 #include "lib/core/logger.h"
 #include "lib/config/config.pb.h"
-#include "lib/layout.pb.h"
+#include "lib/config/layout.pb.h"
 #include "lib/config/proto.h"
 #include "lib/data/layout.h"
 #include <algorithm>
diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc
index 7cf05ac22..631059fd0 100644
--- a/lib/imagewriter/imgimagewriter.cc
+++ b/lib/imagewriter/imgimagewriter.cc
@@ -7,7 +7,7 @@
 #include "lib/config/proto.h"
 #include "lib/config/config.pb.h"
 #include "lib/data/layout.h"
-#include "lib/layout.pb.h"
+#include "lib/config/layout.pb.h"
 #include "lib/core/logger.h"
 #include <algorithm>
 #include <iostream>
diff --git a/lib/vfs/build.py b/lib/vfs/build.py
index 148d2ddd7..d985e3fbf 100644
--- a/lib/vfs/build.py
+++ b/lib/vfs/build.py
@@ -4,7 +4,7 @@
 proto(
     name="proto",
     srcs=["./vfs.proto"],
-    deps=["lib+common_proto", "lib+layout_proto", "lib/external+fl2_proto"],
+    deps=["lib+common_proto", "lib/config+layout_proto", "lib/external+fl2_proto"],
 )
 
 protocc(
@@ -12,7 +12,7 @@
     srcs=[".+proto"],
     deps=[
         "lib+common_proto_lib",
-        "lib+layout_proto_lib",
+        "lib/config+layout_proto_lib",
         "lib/external+fl2_proto_lib",
     ],
 )
diff --git a/lib/vfs/vfs.cc b/lib/vfs/vfs.cc
index 25189f6bd..50340539e 100644
--- a/lib/vfs/vfs.cc
+++ b/lib/vfs/vfs.cc
@@ -2,7 +2,7 @@
 #include "lib/config/config.h"
 #include "vfs.h"
 #include "lib/config/proto.h"
-#include "lib/layout.pb.h"
+#include "lib/config/layout.pb.h"
 #include "lib/data/layout.h"
 #include "lib/data/image.h"
 #include "lib/data/sector.h"
diff --git a/lib/vfs/vfs.proto b/lib/vfs/vfs.proto
index 6ba110047..f48ea4b58 100644
--- a/lib/vfs/vfs.proto
+++ b/lib/vfs/vfs.proto
@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 import "lib/common.proto";
-import "lib/layout.proto";
+import "lib/config/layout.proto";
 
 message AcornDfsProto
 {