Move layout proto into config.

davidgiven · Oct 19, 2024 · 944ac97 · 944ac97
1 parent bb6e8dc
commit 944ac97
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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 → lib/config/layout.proto b/lib/layout.proto → lib/config/layout.proto
diff --git 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
@@ -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
@@ -4,15 +4,15 @@
 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(
     name="proto_lib",
     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
@@ -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
@@ -1,7 +1,7 @@
 syntax = "proto2";
 
 import "lib/common.proto";
-import "lib/layout.proto";
+import "lib/config/layout.proto";
 
 message AcornDfsProto
 {