Merge pull request #786 from davidgiven/refactor

Even more refactoring.
davidgiven · Oct 19, 2024 · d6a11d7 · d6a11d7
2 parents 3c67a67 + 33d241c
commit d6a11d7
Show file tree

Hide file tree

Showing 58 changed files with 141 additions and 148 deletions.
diff --git a/arch/agat/agat.proto b/arch/agat/agat.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message AgatDecoderProto {}
 

diff --git a/arch/amiga/amiga.proto b/arch/amiga/amiga.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message AmigaDecoderProto {}
 

diff --git a/arch/apple2/apple2.proto b/arch/apple2/apple2.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message Apple2DecoderProto {
 	optional uint32 side_one_track_offset = 1

diff --git a/arch/build.py b/arch/build.py
@@ -24,10 +24,10 @@
         "./victor9k/victor9k.proto",
         "./zilogmcz/zilogmcz.proto",
     ],
-    deps=["lib+common_proto"],
+    deps=["lib/config+common_proto"],
 )
 
-protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"])
+protocc(name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"])
 
 cxxlibrary(
     name="arch",

diff --git a/arch/c64/c64.proto b/arch/c64/c64.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message Commodore64DecoderProto {}
 

diff --git a/arch/ibm/ibm.proto b/arch/ibm/ibm.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message IbmDecoderProto {
 	// Next: 11

diff --git a/arch/macintosh/macintosh.proto b/arch/macintosh/macintosh.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message MacintoshDecoderProto {}
 

diff --git a/arch/micropolis/micropolis.proto b/arch/micropolis/micropolis.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message MicropolisDecoderProto {
 	enum ChecksumType {

diff --git a/arch/northstar/northstar.proto b/arch/northstar/northstar.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message NorthstarDecoderProto {}
 

diff --git a/arch/tartu/tartu.proto b/arch/tartu/tartu.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message TartuDecoderProto {}
 

diff --git a/arch/tids990/tids990.proto b/arch/tids990/tids990.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message Tids990DecoderProto {}
 

diff --git a/arch/victor9k/victor9k.proto b/arch/victor9k/victor9k.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 message Victor9kDecoderProto {}
 

diff --git a/build.py b/build.py
@@ -19,36 +19,6 @@
 
 clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"})
 
-cxxlibrary(
-    name="lib",
-    srcs=[
-        "./lib/readerwriter.cc",
-    ],
-    hdrs={
-        "lib/readerwriter.h": "./lib/readerwriter.h",
-    },
-    deps=[
-        "+fmt_lib",
-        "+protocol",
-        "dep/adflib",
-        "dep/fatfs",
-        "dep/hfsutils",
-        "dep/libusbp",
-        "dep/stb",
-        "src/formats",
-        "lib/core",
-        "lib/config",
-        "lib/data",
-        "lib/external",
-        "lib/fluxsink",
-        "lib/fluxsource",
-        "lib/imagereader",
-        "lib/imagewriter",
-        "lib/decoders",
-        "lib/encoders",
-    ],
-)
-
 corpustests = []
 if not glob("../fluxengine-testdata/data"):
     print("fluxengine-testdata not found; skipping corpus tests")

diff --git a/lib/algorithms/build.py b/lib/algorithms/build.py
@@ -0,0 +1,21 @@
+from build.c import cxxlibrary
+
+cxxlibrary(
+    name="algorithms",
+    srcs=["./readerwriter.cc"],
+    hdrs={
+        "lib/algorithms/readerwriter.h": "./readerwriter.h",
+    },
+    deps=[
+        "lib/core",
+        "lib/config",
+        "lib/data",
+        "lib/usb",
+        "lib/encoders",
+        "lib/decoders",
+        "lib/fluxsource",
+        "lib/fluxsink",
+        "lib/imagereader",
+        "lib/imagewriter",
+    ],
+)
diff --git a/lib/readerwriter.cc → lib/algorithms/readerwriter.cc b/lib/readerwriter.cc → lib/algorithms/readerwriter.cc
@@ -2,7 +2,7 @@
 #include "lib/config/config.h"
 #include "lib/config/flags.h"
 #include "lib/data/fluxmap.h"
-#include "lib/readerwriter.h"
+#include "lib/algorithms/readerwriter.h"
 #include "protocol.h"
 #include "lib/usb/usb.h"
 #include "lib/encoders/encoders.h"

diff --git a/lib/readerwriter.h → lib/algorithms/readerwriter.h b/lib/readerwriter.h → lib/algorithms/readerwriter.h
diff --git a/lib/build.py b/lib/build.py
diff --git a/lib/config/build.py b/lib/config/build.py
@@ -1,39 +1,71 @@
 from build.c import cxxlibrary
 from build.protobuf import proto, protocc
 
+proto(name="common_proto", srcs=["./common.proto"])
+protocc(
+    name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_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=[
+        ".+layout_proto_lib",
+        ".+common_proto_lib",
+        "lib/external+fl2_proto_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"],
+)
+
 proto(
     name="proto",
     srcs=["./config.proto"],
     deps=[
-        "lib+common_proto",
-        "lib+layout_proto",
-        "lib+drive_proto",
+        ".+drive_proto",
+        ".+layout_proto",
+        ".+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",
     ],
 )
 
 protocc(
     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",
+        ".+common_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/common.proto → lib/config/common.proto b/lib/common.proto → lib/config/common.proto
diff --git a/lib/config/config.h b/lib/config/config.h
@@ -4,7 +4,7 @@
 
 #include <google/protobuf/message.h>
 #include "lib/config/config.pb.h"
-#include "lib/common.pb.h"
+#include "lib/config/common.pb.h"
 
 class ConfigProto;
 class OptionProto;

diff --git a/lib/config/config.proto b/lib/config/config.proto
@@ -8,9 +8,9 @@ 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/common.proto";
-import "lib/layout.proto";
+import "lib/config/drive.proto";
+import "lib/config/common.proto";
+import "lib/config/layout.proto";
 
 enum SupportStatus
 {

diff --git a/lib/drive.proto → lib/config/drive.proto b/lib/drive.proto → lib/config/drive.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 import "lib/external/fl2.proto";
 
 // Next: 15

diff --git a/lib/layout.proto → lib/config/layout.proto b/lib/layout.proto → lib/config/layout.proto
@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-import "lib/common.proto";
+import "lib/config/common.proto";
 import "lib/external/fl2.proto";
 
 message SectorListProto

diff --git a/lib/config/proto.cc b/lib/config/proto.cc
@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/config/proto.h"
-#include "lib/common.pb.h"
+#include "lib/config/common.pb.h"
 #include <regex>
 
 static ConfigProto config = []()

diff --git a/lib/config/proto.h b/lib/config/proto.h
@@ -2,7 +2,7 @@
 #define PROTO_H
 
 #include <google/protobuf/message.h>
-#include "lib/common.pb.h"
+#include "lib/config/common.pb.h"
 #include "lib/config/config.pb.h"
 
 class ProtoPathNotFoundException : public ErrorException

diff --git a/lib/decoders/build.py b/lib/decoders/build.py
@@ -4,13 +4,13 @@
 proto(
     name="proto",
     srcs=["./decoders.proto"],
-    deps=["lib+common_proto", "arch+proto", "lib/fluxsink+proto"],
+    deps=["lib/config+common_proto", "arch+proto", "lib/fluxsink+proto"],
 )
 
 protocc(
     name="proto_lib",
     srcs=[".+proto"],
-    deps=["lib+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"],
+    deps=["lib/config+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"],
 )
 
 cxxlibrary(

diff --git a/lib/decoders/decoders.proto b/lib/decoders/decoders.proto
@@ -20,7 +20,7 @@ import "arch/tids990/tids990.proto";
 import "arch/victor9k/victor9k.proto";
 import "arch/zilogmcz/zilogmcz.proto";
 import "lib/fluxsink/fluxsink.proto";
-import "lib/common.proto";
+import "lib/config/common.proto";
 
 //NEXT: 33
 message DecoderProto {

diff --git a/lib/encoders/build.py b/lib/encoders/build.py
@@ -4,12 +4,12 @@
 proto(
     name="proto",
     srcs=["./encoders.proto"],
-    deps=["lib+common_proto", "arch+proto"],
+    deps=["lib/config+common_proto", "arch+proto"],
 )
 protocc(
     name="proto_lib",
     srcs=[".+proto"],
-    deps=["lib+common_proto_lib", "arch+proto_lib"],
+    deps=["lib/config+common_proto_lib", "arch+proto_lib"],
 )
 
 cxxlibrary(

diff --git a/lib/fluxsink/build.py b/lib/fluxsink/build.py
@@ -1,8 +1,8 @@
 from build.protobuf import proto, protocc
 from build.c import cxxlibrary
 
-proto(name="proto", srcs=["./fluxsink.proto"], deps=["lib+common_proto"])
-protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"])
+proto(name="proto", srcs=["./fluxsink.proto"], deps=["lib/config+common_proto"])
+protocc(name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"])
 
 cxxlibrary(
     name="fluxsink",