Create a config module containing all the configuration, proto and flags

stuff.

arch/ibm/decoder.cc

@@ -7,7 +7,7 @@
 #include "lib/decoders/fluxpattern.h"
 #include "lib/sector.h"
 #include "arch/ibm/ibm.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <string.h>
 

arch/ibm/encoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "ibm.h"
@@ -9,7 +9,7 @@
 #include "arch/ibm/ibm.pb.h"
 #include "lib/encoders/encoders.pb.h"
 #include "fmt/format.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include <ctype.h>
 

arch/tartu/decoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "arch/tartu/tartu.h"
 #include "lib/core/crc.h"

arch/tartu/encoder.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/tartu/tartu.h"

build.py

@@ -25,15 +25,13 @@
 cxxlibrary(
     name="lib",
     srcs=[
-        "./lib/config.cc",
         "./lib/decoders/decoders.cc",
         "./lib/decoders/fluxdecoder.cc",
         "./lib/decoders/fluxmapreader.cc",
         "./lib/decoders/fluxpattern.cc",
         "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
         "./lib/fl2.cc",
-        "./lib/flags.cc",
         "./lib/fluxmap.cc",
         "./lib/fluxsink/a2rfluxsink.cc",
         "./lib/fluxsink/aufluxsink.cc",
@@ -83,7 +81,6 @@
         "./lib/layout.cc",
         "./lib/ldbs.cc",
         "./lib/logrenderer.cc",
-        "./lib/proto.cc",
         "./lib/readerwriter.cc",
         "./lib/sector.cc",
         "./lib/usb/applesauceusb.cc",
@@ -156,7 +153,6 @@
         "arch/c64/c64.h": "./arch/c64/c64.h",
         "arch/tartu/tartu.h": "./arch/tartu/tartu.h",
         "lib/a2r.h": "./lib/a2r.h",
-        "lib/config.h": "./lib/config.h",
         "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
         "lib/decoders/fluxmapreader.h": "./lib/decoders/fluxmapreader.h",
@@ -165,7 +161,6 @@
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/scp.h": "./lib/scp.h",
         "lib/fl2.h": "./lib/fl2.h",
-        "lib/flags.h": "./lib/flags.h",
         "lib/flux.h": "./lib/flux.h",
         "lib/fluxmap.h": "./lib/fluxmap.h",
         "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
@@ -179,7 +174,6 @@
         "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/layout.h": "./lib/layout.h",
         "lib/ldbs.h": "./lib/ldbs.h",
-        "lib/proto.h": "./lib/proto.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
         "lib/sector.h": "./lib/sector.h",
         "lib/usb/applesauce.h": "./lib/usb/applesauce.h",
@@ -196,8 +190,8 @@
         "dep/hfsutils",
         "dep/libusbp",
         "dep/stb",
-        "lib+config_proto_lib",
         "lib/core",
+        "lib/config",
         "lib/fluxsource+proto_lib",
     ],
 )

lib/build.py

@@ -25,38 +25,3 @@
     srcs=[".+drive_proto"],
     deps=[".+common_proto_lib", "+fl2_proto_lib", ".+layout_proto_lib"],
 )
-
-proto(
-    name="config_proto",
-    srcs=["./config.proto"],
-    deps=[
-        ".+common_proto",
-        ".+layout_proto",
-        ".+drive_proto",
-        "+fl2_proto",
-        "lib/fluxsource+proto",
-        "lib/fluxsink+proto",
-        "lib/vfs+proto",
-        "lib/usb+proto",
-        "lib/encoders+proto",
-        "lib/decoders+proto",
-        "lib/imagereader+proto",
-        "lib/imagewriter+proto",
-    ],
-)
-
-protocc(
-    name="config_proto_lib",
-    srcs=[".+common_proto", ".+config_proto", "arch+proto", "+fl2_proto"],
-    deps=[
-        "lib/fluxsource+proto_lib",
-        "lib/fluxsink+proto_lib",
-        "lib/vfs+proto_lib",
-        "lib/usb+proto_lib",
-        "lib/encoders+proto_lib",
-        "lib/decoders+proto_lib",
-        "lib/imagereader+proto_lib",
-        "lib/imagewriter+proto_lib",
-        "lib+drive_proto_lib",
-    ],
-)

lib/config/build.py

@@ -0,0 +1,56 @@
+from build.c import cxxlibrary
+from build.protobuf import proto, protocc
+
+proto(
+    name="proto",
+    srcs=["./config.proto"],
+    deps=[
+        "lib+common_proto",
+        "lib+layout_proto",
+        "lib+drive_proto",
+        "+fl2_proto",
+        "lib/fluxsource+proto",
+        "lib/fluxsink+proto",
+        "lib/vfs+proto",
+        "lib/usb+proto",
+        "lib/encoders+proto",
+        "lib/decoders+proto",
+        "lib/imagereader+proto",
+        "lib/imagewriter+proto",
+    ],
+)
+
+protocc(
+    name="proto_lib",
+    srcs=[".+proto", "arch+proto", "+fl2_proto"],
+    deps=[
+        "lib/fluxsource+proto_lib",
+        "lib/fluxsink+proto_lib",
+        "lib/vfs+proto_lib",
+        "lib/usb+proto_lib",
+        "lib/encoders+proto_lib",
+        "lib/decoders+proto_lib",
+        "lib/imagereader+proto_lib",
+        "lib/imagewriter+proto_lib",
+        "lib+drive_proto_lib",
+    ],
+)
+
+cxxlibrary(
+    name="config",
+    srcs=[
+        "./config.cc",
+        "./proto.cc",
+        "./flags.cc",
+    ],
+    hdrs={
+        "lib/config/config.h": "./config.h",
+        "lib/config/proto.h": "./proto.h",
+        "lib/config/flags.h": "./flags.h",
+    },
+    deps=[
+        "lib/core",
+        ".+proto_lib",
+        "+fmt_lib",
+    ],
+)

lib/config.cc → lib/config/config.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/proto.h"
 #include "lib/core/logger.h"
 #include "lib/core/utils.h"
 #include <fstream>

lib/config.h → lib/config/config.h

@@ -3,7 +3,7 @@
 #ifdef __cplusplus
 
 #include <google/protobuf/message.h>
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 #include "lib/common.pb.h"
 
 class ConfigProto;

lib/flags.cc → lib/config/flags.cc

@@ -1,11 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
-#include "lib/proto.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include "lib/core/logger.h"
-#include "lib/fluxsource/fluxsource.h"
-#include "lib/imagereader/imagereader.h"
 #include <google/protobuf/text_format.h>
 #include <regex>
 #include <fstream>

lib/proto.cc → lib/config/proto.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/common.pb.h"
 #include <regex>
 

lib/proto.h → lib/config/proto.h

@@ -3,7 +3,7 @@
 
 #include <google/protobuf/message.h>
 #include "lib/common.pb.h"
-#include "lib/config.pb.h"
+#include "lib/config/config.pb.h"
 
 class ProtoPathNotFoundException : public ErrorException
 {

lib/decoders/decoders.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "arch/agat/agat.h"

lib/decoders/fluxmapreader.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>

lib/decoders/fluxmapreader.h

@@ -2,7 +2,7 @@
 #define FLUXMAPREADER_H
 
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class DecoderProto;

lib/decoders/fluxpattern.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/fluxpattern.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>
 #include <math.h>

lib/decoders/fluxpattern.h

@@ -2,7 +2,7 @@
 
 #include "lib/core/utils.h"
 #include "lib/fluxmap.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "protocol.h"
 
 class FluxMatcher;

lib/encoders/encoders.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
+#include "lib/config/config.h"
 #include "lib/fluxmap.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
@@ -16,7 +16,7 @@
 #include "arch/tids990/tids990.h"
 #include "arch/victor9k/victor9k.h"
 #include "lib/encoders/encoders.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/layout.h"
 #include "lib/image.h"
 #include "protocol.h"

lib/fl2.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/fl2.pb.h"
 #include <fstream>

lib/fluxsink/a2rfluxsink.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fluxmap.h"
 #include "lib/layout.h"
 #include "lib/a2r.h"

lib/fluxsink/aufluxsink.cc

@@ -1,12 +1,12 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

lib/fluxsink/fl2fluxsink.cc

@@ -1,13 +1,13 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/decoders/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/fl2.pb.h"
 #include "lib/fl2.h"
 #include <fstream>

lib/fluxsink/fluxsink.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/flags.h"
-#include "lib/config.h"
+#include "lib/config/flags.h"
+#include "lib/config/config.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/config.pb.h"
-#include "lib/proto.h"
+#include "lib/config/config.pb.h"
+#include "lib/config/proto.h"
 #include "lib/core/utils.h"
 #include <regex>
 

lib/fluxsink/fluxsink.h

@@ -1,7 +1,7 @@
 #ifndef FLUXSINK_H
 #define FLUXSINK_H
 
-#include "lib/flags.h"
+#include "lib/config/flags.h"
 #include <ostream>
 
 class Fluxmap;

lib/fluxsink/hardwarefluxsink.cc

@@ -1,9 +1,9 @@
 #include "lib/core/globals.h"
-#include "lib/config.h"
-#include "lib/flags.h"
+#include "lib/config/config.h"
+#include "lib/config/flags.h"
 #include "lib/fluxmap.h"
 #include "lib/core/logger.h"
-#include "lib/proto.h"
+#include "lib/config/proto.h"
 #include "lib/usb/usb.h"
 #include "lib/fluxsink/fluxsink.h"
 #include "lib/fluxsink/fluxsink.pb.h"