Move the drive proto into config.

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

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/lib/build.py b/lib/build.py
@@ -16,18 +16,3 @@
     srcs=[".+layout_proto"],
     deps=[".+common_proto_lib", "lib/external+fl2_proto_lib"],
 )
-
-proto(
-    name="drive_proto",
-    srcs=["./drive.proto"],
-    deps=[".+common_proto", "lib/external+fl2_proto", ".+layout_proto"],
-)
-protocc(
-    name="drive_proto_lib",
-    srcs=[".+drive_proto"],
-    deps=[
-        ".+common_proto_lib",
-        "lib/external+fl2_proto_lib",
-        ".+layout_proto_lib",
-    ],
-)
diff --git a/lib/config/build.py b/lib/config/build.py
@@ -1,13 +1,28 @@
 from build.c import cxxlibrary
 from build.protobuf import proto, protocc
 
+proto(
+    name="drive_proto",
+    srcs=["./drive.proto"],
+    deps=["lib+common_proto", "lib/external+fl2_proto", "lib+layout_proto"],
+)
+
+protocc(
+    name="drive_proto_lib",
+    srcs=[".+drive_proto"],
+    deps=[
+        "lib+common_proto_lib",
+        "lib/external+fl2_proto_lib",
+        "lib+layout_proto_lib",
+    ],
+)
 proto(
     name="proto",
     srcs=["./config.proto"],
     deps=[
         "lib+common_proto",
         "lib+layout_proto",
-        "lib+drive_proto",
+        ".+drive_proto",
         "lib/external+fl2_proto",
         "lib/fluxsource+proto",
         "lib/fluxsink+proto",
@@ -24,16 +39,16 @@
     name="proto_lib",
     srcs=[".+proto", "arch+proto"],
     deps=[
-        "lib/fluxsource+proto_lib",
-        "lib/fluxsink+proto_lib",
-        "lib/vfs+proto_lib",
-        "lib/usb+proto_lib",
-        "lib/encoders+proto_lib",
+        ".+drive_proto_lib",
         "lib/decoders+proto_lib",
+        "lib/encoders+proto_lib",
+        "lib/external+fl2_proto_lib",
+        "lib/fluxsink+proto_lib",
+        "lib/fluxsource+proto_lib",
         "lib/imagereader+proto_lib",
         "lib/imagewriter+proto_lib",
-        "lib/external+fl2_proto_lib",
-        "lib+drive_proto_lib",
+        "lib/usb+proto_lib",
+        "lib/vfs+proto_lib",
     ],
 )
 

diff --git a/lib/config/config.proto b/lib/config/config.proto
@@ -8,7 +8,7 @@ import "lib/fluxsource/fluxsource.proto";
 import "lib/fluxsink/fluxsink.proto";
 import "lib/usb/usb.proto";
 import "lib/vfs/vfs.proto";
-import "lib/drive.proto";
+import "lib/config/drive.proto";
 import "lib/common.proto";
 import "lib/layout.proto";
 

diff --git a/lib/drive.proto → lib/config/drive.proto b/lib/drive.proto → lib/config/drive.proto