From e1f2494966e3b459553c2d303135b022e3459009 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 13 Oct 2024 11:57:18 +0200 Subject: [PATCH] Create a config module containing all the configuration, proto and flags stuff. --- arch/ibm/decoder.cc | 2 +- arch/ibm/encoder.cc | 4 +- arch/tartu/decoder.cc | 2 +- arch/tartu/encoder.cc | 2 +- build.py | 8 +--- lib/build.py | 35 ---------------- lib/config/build.py | 56 ++++++++++++++++++++++++++ lib/{ => config}/config.cc | 4 +- lib/{ => config}/config.h | 2 +- lib/{ => config}/config.proto | 0 lib/{ => config}/flags.cc | 8 ++-- lib/{ => config}/flags.h | 0 lib/{ => config}/proto.cc | 2 +- lib/{ => config}/proto.h | 2 +- lib/decoders/decoders.cc | 4 +- lib/decoders/fluxmapreader.cc | 4 +- lib/decoders/fluxmapreader.h | 2 +- lib/decoders/fluxpattern.cc | 4 +- lib/decoders/fluxpattern.h | 2 +- lib/encoders/encoders.cc | 4 +- lib/fl2.cc | 2 +- lib/fluxsink/a2rfluxsink.cc | 4 +- lib/fluxsink/aufluxsink.cc | 4 +- lib/fluxsink/fl2fluxsink.cc | 6 +-- lib/fluxsink/fluxsink.cc | 8 ++-- lib/fluxsink/fluxsink.h | 2 +- lib/fluxsink/hardwarefluxsink.cc | 6 +-- lib/fluxsink/scpfluxsink.cc | 6 +-- lib/fluxsink/vcdfluxsink.cc | 4 +- lib/fluxsource/a2rfluxsource.cc | 2 +- lib/fluxsource/cwffluxsource.cc | 2 +- lib/fluxsource/dmkfluxsource.cc | 2 +- lib/fluxsource/fl2fluxsource.cc | 2 +- lib/fluxsource/fluxsource.cc | 8 ++-- lib/fluxsource/fluxsource.h | 4 +- lib/fluxsource/hardwarefluxsource.cc | 6 +-- lib/fluxsource/scpfluxsource.cc | 2 +- lib/globals.h | 2 +- lib/imagereader/d64imagereader.cc | 4 +- lib/imagereader/d88imagereader.cc | 6 +-- lib/imagereader/dimimagereader.cc | 8 ++-- lib/imagereader/diskcopyimagereader.cc | 4 +- lib/imagereader/fdiimagereader.cc | 8 ++-- lib/imagereader/imagereader.cc | 8 ++-- lib/imagereader/imagereader.h | 2 +- lib/imagereader/imdimagereader.cc | 6 +-- lib/imagereader/imgimagereader.cc | 8 ++-- lib/imagereader/jv3imagereader.cc | 4 +- lib/imagereader/nfdimagereader.cc | 6 +-- lib/imagereader/nsiimagereader.cc | 2 +- lib/imagereader/td0imagereader.cc | 4 +- lib/imagewriter/d64imagewriter.cc | 4 +- lib/imagewriter/d88imagewriter.cc | 4 +- lib/imagewriter/diskcopyimagewriter.cc | 4 +- lib/imagewriter/imagewriter.cc | 8 ++-- lib/imagewriter/imdimagewriter.cc | 4 +- lib/imagewriter/imgimagewriter.cc | 8 ++-- lib/imagewriter/ldbsimagewriter.cc | 4 +- lib/imagewriter/nsiimagewriter.cc | 2 +- lib/imagewriter/rawimagewriter.cc | 2 +- lib/layout.cc | 4 +- lib/readerwriter.cc | 8 ++-- lib/usb/usb.cc | 6 +-- lib/usb/usb.h | 2 +- lib/usb/usbfinder.cc | 2 +- lib/vfs/acorndfs.cc | 2 +- lib/vfs/amigaffs.cc | 6 +-- lib/vfs/appledos.cc | 2 +- lib/vfs/brother120fs.cc | 2 +- lib/vfs/cbmfs.cc | 6 +-- lib/vfs/cpmfs.cc | 2 +- lib/vfs/fatfs.cc | 2 +- lib/vfs/fluxsectorinterface.cc | 2 +- lib/vfs/lif.cc | 2 +- lib/vfs/machfs.cc | 2 +- lib/vfs/microdos.cc | 2 +- lib/vfs/philefs.cc | 2 +- lib/vfs/prodos.cc | 2 +- lib/vfs/roland.cc | 2 +- lib/vfs/smaky6fs.cc | 2 +- lib/vfs/vfs.cc | 6 +-- lib/vfs/zdos.cc | 2 +- scripts/build.py | 6 +-- scripts/mkdoc.cc | 4 +- scripts/mkdocindex.cc | 4 +- scripts/protoencode.cc | 4 +- src/build.py | 2 +- src/fe-analysedriveresponse.cc | 6 +-- src/fe-analyselayout.cc | 4 +- src/fe-format.cc | 4 +- src/fe-getdiskinfo.cc | 4 +- src/fe-getfile.cc | 4 +- src/fe-getfileinfo.cc | 4 +- src/fe-inspect.cc | 6 +-- src/fe-ls.cc | 4 +- src/fe-merge.cc | 4 +- src/fe-mkdir.cc | 4 +- src/fe-mv.cc | 4 +- src/fe-putfile.cc | 4 +- src/fe-rawread.cc | 6 +-- src/fe-rawwrite.cc | 6 +-- src/fe-read.cc | 6 +-- src/fe-rm.cc | 4 +- src/fe-rpm.cc | 6 +-- src/fe-seek.cc | 6 +-- src/fe-testbandwidth.cc | 2 +- src/fe-testdevices.cc | 2 +- src/fe-testvoltages.cc | 2 +- src/fe-write.cc | 6 +-- src/fileutils.cc | 6 +-- src/fluxengine.cc | 2 +- src/formats/build.py | 2 +- src/gui/build.py | 2 +- src/gui/context.cc | 2 +- src/gui/explorerpanel.cc | 4 +- src/gui/idlepanel.cc | 6 +-- src/gui/imagerpanel.cc | 4 +- src/gui/mainwindow.cc | 4 +- src/readibm.h | 2 +- tests/build.py | 6 +-- tests/configs.cc | 4 +- tests/cpmfs.cc | 4 +- tests/flags.cc | 2 +- tests/layout.cc | 6 +-- tests/options.cc | 6 +-- tests/proto.cc | 4 +- tests/vfs.cc | 2 +- tools/build.py | 6 +-- 128 files changed, 301 insertions(+), 288 deletions(-) create mode 100644 lib/config/build.py rename lib/{ => config}/config.cc (99%) rename lib/{ => config}/config.h (99%) rename lib/{ => config}/config.proto (100%) rename lib/{ => config}/flags.cc (98%) rename lib/{ => config}/flags.h (100%) rename lib/{ => config}/proto.cc (99%) rename lib/{ => config}/proto.h (97%) diff --git a/arch/ibm/decoder.cc b/arch/ibm/decoder.cc index cb24f897..bd71cc41 100644 --- a/arch/ibm/decoder.cc +++ b/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 diff --git a/arch/ibm/encoder.cc b/arch/ibm/encoder.cc index 002da53e..4215b32a 100644 --- a/arch/ibm/encoder.cc +++ b/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 diff --git a/arch/tartu/decoder.cc b/arch/tartu/decoder.cc index 8da1507e..a3403c27 100644 --- a/arch/tartu/decoder.cc +++ b/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" diff --git a/arch/tartu/encoder.cc b/arch/tartu/encoder.cc index 6f70168d..dd49fbf9 100644 --- a/arch/tartu/encoder.cc +++ b/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" diff --git a/build.py b/build.py index 5fc03aea..f492b2cf 100644 --- a/build.py +++ b/build.py @@ -25,7 +25,6 @@ protocc(name="fl2_proto_lib", srcs=["+fl2_proto"]) cxxlibrary( name="lib", srcs=[ - "./lib/config.cc", "./lib/decoders/decoders.cc", "./lib/decoders/fluxdecoder.cc", "./lib/decoders/fluxmapreader.cc", @@ -33,7 +32,6 @@ cxxlibrary( "./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 @@ cxxlibrary( "./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 @@ cxxlibrary( "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 @@ cxxlibrary( "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 @@ cxxlibrary( "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 @@ cxxlibrary( "dep/hfsutils", "dep/libusbp", "dep/stb", - "lib+config_proto_lib", "lib/core", + "lib/config", "lib/fluxsource+proto_lib", ], ) diff --git a/lib/build.py b/lib/build.py index a9bd9b46..925fa1c0 100644 --- a/lib/build.py +++ b/lib/build.py @@ -25,38 +25,3 @@ protocc( 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", - ], -) diff --git a/lib/config/build.py b/lib/config/build.py new file mode 100644 index 00000000..aabd54a4 --- /dev/null +++ b/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", + ], +) diff --git a/lib/config.cc b/lib/config/config.cc similarity index 99% rename from lib/config.cc rename to lib/config/config.cc index da8bd8f8..8a261b75 100644 --- a/lib/config.cc +++ b/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 diff --git a/lib/config.h b/lib/config/config.h similarity index 99% rename from lib/config.h rename to lib/config/config.h index ce0a06b3..09c975bb 100644 --- a/lib/config.h +++ b/lib/config/config.h @@ -3,7 +3,7 @@ #ifdef __cplusplus #include -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/common.pb.h" class ConfigProto; diff --git a/lib/config.proto b/lib/config/config.proto similarity index 100% rename from lib/config.proto rename to lib/config/config.proto diff --git a/lib/flags.cc b/lib/config/flags.cc similarity index 98% rename from lib/flags.cc rename to lib/config/flags.cc index ec6dfe17..9528b90d 100644 --- a/lib/flags.cc +++ b/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 #include #include diff --git a/lib/flags.h b/lib/config/flags.h similarity index 100% rename from lib/flags.h rename to lib/config/flags.h diff --git a/lib/proto.cc b/lib/config/proto.cc similarity index 99% rename from lib/proto.cc rename to lib/config/proto.cc index 67ccc9b2..1d258bda 100644 --- a/lib/proto.cc +++ b/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 diff --git a/lib/proto.h b/lib/config/proto.h similarity index 97% rename from lib/proto.h rename to lib/config/proto.h index 1e271575..5809e03b 100644 --- a/lib/proto.h +++ b/lib/config/proto.h @@ -3,7 +3,7 @@ #include #include "lib/common.pb.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" class ProtoPathNotFoundException : public ErrorException { diff --git a/lib/decoders/decoders.cc b/lib/decoders/decoders.cc index c83e7ff3..f94061e6 100644 --- a/lib/decoders/decoders.cc +++ b/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" diff --git a/lib/decoders/fluxmapreader.cc b/lib/decoders/fluxmapreader.cc index 1ec1be79..eb3dcc4b 100644 --- a/lib/decoders/fluxmapreader.cc +++ b/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 #include diff --git a/lib/decoders/fluxmapreader.h b/lib/decoders/fluxmapreader.h index 1f14bd68..13e5ef43 100644 --- a/lib/decoders/fluxmapreader.h +++ b/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; diff --git a/lib/decoders/fluxpattern.cc b/lib/decoders/fluxpattern.cc index 4836b54c..7facf0b0 100644 --- a/lib/decoders/fluxpattern.cc +++ b/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 #include diff --git a/lib/decoders/fluxpattern.h b/lib/decoders/fluxpattern.h index 262dfd99..c98c5424 100644 --- a/lib/decoders/fluxpattern.h +++ b/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; diff --git a/lib/encoders/encoders.cc b/lib/encoders/encoders.cc index c7ec5c3c..ca5e73cb 100644 --- a/lib/encoders/encoders.cc +++ b/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" diff --git a/lib/fl2.cc b/lib/fl2.cc index a418e245..f3c0ed14 100644 --- a/lib/fl2.cc +++ b/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 diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc index c658a694..6ce328be 100644 --- a/lib/fluxsink/a2rfluxsink.cc +++ b/lib/fluxsink/a2rfluxsink.cc @@ -1,5 +1,5 @@ #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" @@ -7,7 +7,7 @@ #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" diff --git a/lib/fluxsink/aufluxsink.cc b/lib/fluxsink/aufluxsink.cc index e5303b57..688b5a9a 100644 --- a/lib/fluxsink/aufluxsink.cc +++ b/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 #include #include diff --git a/lib/fluxsink/fl2fluxsink.cc b/lib/fluxsink/fl2fluxsink.cc index d3f4ca3a..06aba3f2 100644 --- a/lib/fluxsink/fl2fluxsink.cc +++ b/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 diff --git a/lib/fluxsink/fluxsink.cc b/lib/fluxsink/fluxsink.cc index 3d5bab81..c8d844ba 100644 --- a/lib/fluxsink/fluxsink.cc +++ b/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 diff --git a/lib/fluxsink/fluxsink.h b/lib/fluxsink/fluxsink.h index d083a905..ab12d9dd 100644 --- a/lib/fluxsink/fluxsink.h +++ b/lib/fluxsink/fluxsink.h @@ -1,7 +1,7 @@ #ifndef FLUXSINK_H #define FLUXSINK_H -#include "lib/flags.h" +#include "lib/config/flags.h" #include class Fluxmap; diff --git a/lib/fluxsink/hardwarefluxsink.cc b/lib/fluxsink/hardwarefluxsink.cc index c05e71d4..65916398 100644 --- a/lib/fluxsink/hardwarefluxsink.cc +++ b/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" diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc index 89aa4980..42a5a87a 100644 --- a/lib/fluxsink/scpfluxsink.cc +++ b/lib/fluxsink/scpfluxsink.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/fluxmap.h" #include "lib/layout.h" #include "lib/scp.h" diff --git a/lib/fluxsink/vcdfluxsink.cc b/lib/fluxsink/vcdfluxsink.cc index 8485d74f..1ef830eb 100644 --- a/lib/fluxsink/vcdfluxsink.cc +++ b/lib/fluxsink/vcdfluxsink.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 #include #include diff --git a/lib/fluxsource/a2rfluxsource.cc b/lib/fluxsource/a2rfluxsource.cc index 9ae51da3..f0b1a62b 100644 --- a/lib/fluxsource/a2rfluxsource.cc +++ b/lib/fluxsource/a2rfluxsource.cc @@ -2,7 +2,7 @@ #include "lib/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include struct A2Rv2Flux diff --git a/lib/fluxsource/cwffluxsource.cc b/lib/fluxsource/cwffluxsource.cc index 5ca86bea..017d3c8f 100644 --- a/lib/fluxsource/cwffluxsource.cc +++ b/lib/fluxsource/cwffluxsource.cc @@ -3,7 +3,7 @@ #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/catweasel.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include struct CwfHeader diff --git a/lib/fluxsource/dmkfluxsource.cc b/lib/fluxsource/dmkfluxsource.cc index d87c0b5d..2518d9d8 100644 --- a/lib/fluxsource/dmkfluxsource.cc +++ b/lib/fluxsource/dmkfluxsource.cc @@ -3,7 +3,7 @@ #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/catweasel.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" #include #include diff --git a/lib/fluxsource/fl2fluxsource.cc b/lib/fluxsource/fl2fluxsource.cc index eef62eba..6ba05b44 100644 --- a/lib/fluxsource/fl2fluxsource.cc +++ b/lib/fluxsource/fl2fluxsource.cc @@ -3,7 +3,7 @@ #include "lib/fluxsource/fluxsource.pb.h" #include "lib/fl2.pb.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fl2.h" #include "lib/fluxmap.h" #include diff --git a/lib/fluxsource/fluxsource.cc b/lib/fluxsource/fluxsource.cc index c0506b7e..4fe8d9fd 100644 --- a/lib/fluxsource/fluxsource.cc +++ b/lib/fluxsource/fluxsource.cc @@ -1,10 +1,10 @@ #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/fluxsource/fluxsource.h" #include "lib/fluxmap.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" std::unique_ptr FluxSource::create(Config& config) diff --git a/lib/fluxsource/fluxsource.h b/lib/fluxsource/fluxsource.h index 53d2a1eb..20f8515f 100644 --- a/lib/fluxsource/fluxsource.h +++ b/lib/fluxsource/fluxsource.h @@ -1,8 +1,8 @@ #ifndef FLUXSOURCE_H #define FLUXSOURCE_H -#include "lib/flags.h" -#include "lib/config.pb.h" +#include "lib/config/flags.h" +#include "lib/config/config.pb.h" class A2rFluxSourceProto; class CwfFluxSourceProto; diff --git a/lib/fluxsource/hardwarefluxsource.cc b/lib/fluxsource/hardwarefluxsource.cc index 7c119ba3..b998533a 100644 --- a/lib/fluxsource/hardwarefluxsource.cc +++ b/lib/fluxsource/hardwarefluxsource.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/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.pb.h" diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc index b9c4d8f1..a835337c 100644 --- a/lib/fluxsource/scpfluxsource.cc +++ b/lib/fluxsource/scpfluxsource.cc @@ -5,7 +5,7 @@ #include "lib/core/utils.h" #include "lib/fluxsource/fluxsource.h" #include "lib/scp.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" #include diff --git a/lib/globals.h b/lib/globals.h index 96f8f0d6..b8c88092 100644 --- a/lib/globals.h +++ b/lib/globals.h @@ -67,6 +67,6 @@ struct overloaded : Ts... template overloaded(Ts...) -> overloaded; -#include "lib/config.h" +#include "lib/config/config.h" #endif diff --git a/lib/imagereader/d64imagereader.cc b/lib/imagereader/d64imagereader.cc index 13e90f0f..efe2f71e 100644 --- a/lib/imagereader/d64imagereader.cc +++ b/lib/imagereader/d64imagereader.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include #include #include diff --git a/lib/imagereader/d88imagereader.cc b/lib/imagereader/d88imagereader.cc index 4e2d911a..ebce7a1d 100644 --- a/lib/imagereader/d88imagereader.cc +++ b/lib/imagereader/d88imagereader.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/dimimagereader.cc b/lib/imagereader/dimimagereader.cc index d5b2b4c5..c2ba6a26 100644 --- a/lib/imagereader/dimimagereader.cc +++ b/lib/imagereader/dimimagereader.cc @@ -1,12 +1,12 @@ #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/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/proto.h" -#include "lib/config.pb.h" +#include "lib/config/proto.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc index c92575e0..fdd69335 100644 --- a/lib/imagereader/diskcopyimagereader.cc +++ b/lib/imagereader/diskcopyimagereader.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/fdiimagereader.cc b/lib/imagereader/fdiimagereader.cc index e856f324..b2529f80 100644 --- a/lib/imagereader/fdiimagereader.cc +++ b/lib/imagereader/fdiimagereader.cc @@ -1,12 +1,12 @@ #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/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/imagereader.cc b/lib/imagereader/imagereader.cc index c97c0fd0..b0240769 100644 --- a/lib/imagereader/imagereader.cc +++ b/lib/imagereader/imagereader.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/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/core/utils.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/image.h" #include "lib/layout.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/logger.h" #include #include diff --git a/lib/imagereader/imagereader.h b/lib/imagereader/imagereader.h index 0199972a..42ba489b 100644 --- a/lib/imagereader/imagereader.h +++ b/lib/imagereader/imagereader.h @@ -2,7 +2,7 @@ #define IMAGEREADER_H #include "lib/image.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" class ImageSpec; class ImageReaderProto; diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc index da2e096b..58efd031 100644 --- a/lib/imagereader/imdimagereader.cc +++ b/lib/imagereader/imdimagereader.cc @@ -1,12 +1,12 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" #include "lib/layout.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc index ac888836..3333e6b7 100644 --- a/lib/imagereader/imgimagereader.cc +++ b/lib/imagereader/imgimagereader.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/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/layout.pb.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/layout.h" #include #include diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc index de317c00..20f55de0 100644 --- a/lib/imagereader/jv3imagereader.cc +++ b/lib/imagereader/jv3imagereader.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/nfdimagereader.cc b/lib/imagereader/nfdimagereader.cc index a7dc8b0f..70864a6c 100644 --- a/lib/imagereader/nfdimagereader.cc +++ b/lib/imagereader/nfdimagereader.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagereader/nsiimagereader.cc b/lib/imagereader/nsiimagereader.cc index ce22a323..2b00f7c1 100644 --- a/lib/imagereader/nsiimagereader.cc +++ b/lib/imagereader/nsiimagereader.cc @@ -1,7 +1,7 @@ /* Image reader for Northstar floppy disk images */ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" diff --git a/lib/imagereader/td0imagereader.cc b/lib/imagereader/td0imagereader.cc index 26288ab6..47bef5f7 100644 --- a/lib/imagereader/td0imagereader.cc +++ b/lib/imagereader/td0imagereader.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagereader/imagereader.h" #include "lib/image.h" #include "lib/core/crc.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc index 44dda2ef..691632fc 100644 --- a/lib/imagewriter/d64imagewriter.cc +++ b/lib/imagewriter/d64imagewriter.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/image.h" #include "lib/ldbs.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagewriter/d88imagewriter.cc b/lib/imagewriter/d88imagewriter.cc index 7623caa8..84d0bc3c 100644 --- a/lib/imagewriter/d88imagewriter.cc +++ b/lib/imagewriter/d88imagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/image.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/layout.h" #include "lib/core/logger.h" #include diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc index be2a1dcb..60845ba5 100644 --- a/lib/imagewriter/diskcopyimagewriter.cc +++ b/lib/imagewriter/diskcopyimagewriter.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/ldbs.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagewriter/imagewriter.cc b/lib/imagewriter/imagewriter.cc index 2782a21f..8f8e4f5e 100644 --- a/lib/imagewriter/imagewriter.cc +++ b/lib/imagewriter/imagewriter.cc @@ -1,12 +1,12 @@ #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/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/image.h" #include "lib/core/utils.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include "lib/layout.h" #include "lib/core/logger.h" #include diff --git a/lib/imagewriter/imdimagewriter.cc b/lib/imagewriter/imdimagewriter.cc index 07360f9a..9e397de6 100644 --- a/lib/imagewriter/imdimagewriter.cc +++ b/lib/imagewriter/imdimagewriter.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/image.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/layout.h" #include "lib/core/logger.h" #include diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc index 5b4d26b5..4b37eb87 100644 --- a/lib/imagewriter/imgimagewriter.cc +++ b/lib/imagewriter/imgimagewriter.cc @@ -1,11 +1,11 @@ #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/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/image.h" -#include "lib/proto.h" -#include "lib/config.pb.h" +#include "lib/config/proto.h" +#include "lib/config/config.pb.h" #include "lib/layout.h" #include "lib/layout.pb.h" #include "lib/core/logger.h" diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc index c24f9238..129b8f84 100644 --- a/lib/imagewriter/ldbsimagewriter.cc +++ b/lib/imagewriter/ldbsimagewriter.cc @@ -1,11 +1,11 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/ldbs.h" #include "lib/image.h" #include "lib/core/logger.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include #include diff --git a/lib/imagewriter/nsiimagewriter.cc b/lib/imagewriter/nsiimagewriter.cc index 39893cd3..285ff008 100644 --- a/lib/imagewriter/nsiimagewriter.cc +++ b/lib/imagewriter/nsiimagewriter.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/decoders/decoders.h" diff --git a/lib/imagewriter/rawimagewriter.cc b/lib/imagewriter/rawimagewriter.cc index c1684f5a..11b56e24 100644 --- a/lib/imagewriter/rawimagewriter.cc +++ b/lib/imagewriter/rawimagewriter.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/decoders/decoders.h" diff --git a/lib/layout.cc b/lib/layout.cc index b5dd5bab..b099632d 100644 --- a/lib/layout.cc +++ b/lib/layout.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "lib/layout.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/core/logger.h" #include "lib/fl2.h" diff --git a/lib/readerwriter.cc b/lib/readerwriter.cc index 36585756..02fb462b 100644 --- a/lib/readerwriter.cc +++ b/lib/readerwriter.cc @@ -1,6 +1,6 @@ #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/readerwriter.h" #include "protocol.h" @@ -16,8 +16,8 @@ #include "lib/core/logger.h" #include "lib/layout.h" #include "lib/core/utils.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include enum ReadResult diff --git a/lib/usb/usb.cc b/lib/usb/usb.cc index 078aaa7b..704c92c1 100644 --- a/lib/usb/usb.cc +++ b/lib/usb/usb.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 "usb.h" #include "libusbp_config.h" #include "libusbp.hpp" #include "protocol.h" #include "lib/fluxmap.h" #include "lib/core/bytes.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "usbfinder.h" #include "lib/core/logger.h" #include "applesauce.h" diff --git a/lib/usb/usb.h b/lib/usb/usb.h index bed57fcc..52b218af 100644 --- a/lib/usb/usb.h +++ b/lib/usb/usb.h @@ -2,7 +2,7 @@ #define USB_H #include "lib/core/bytes.h" -#include "lib/flags.h" +#include "lib/config/flags.h" class Fluxmap; class GreaseweazleProto; diff --git a/lib/usb/usbfinder.cc b/lib/usb/usbfinder.cc index 067cab78..d9c357e8 100644 --- a/lib/usb/usbfinder.cc +++ b/lib/usb/usbfinder.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "usb.h" #include "lib/core/bytes.h" #include "usbfinder.h" diff --git a/lib/vfs/acorndfs.cc b/lib/vfs/acorndfs.cc index ab48735f..73df8d7d 100644 --- a/lib/vfs/acorndfs.cc +++ b/lib/vfs/acorndfs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" class AcornDfsFilesystem; diff --git a/lib/vfs/amigaffs.cc b/lib/vfs/amigaffs.cc index beec3674..28d2464a 100644 --- a/lib/vfs/amigaffs.cc +++ b/lib/vfs/amigaffs.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include "lib/layout.h" #include "lib/core/logger.h" diff --git a/lib/vfs/appledos.cc b/lib/vfs/appledos.cc index 536a5bda..4397f5c7 100644 --- a/lib/vfs/appledos.cc +++ b/lib/vfs/appledos.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" #include "lib/core/utils.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" /* This is described here: * http://fileformats.archiveteam.org/wiki/Apple_DOS_file_system diff --git a/lib/vfs/brother120fs.cc b/lib/vfs/brother120fs.cc index 59925c98..1347f944 100644 --- a/lib/vfs/brother120fs.cc +++ b/lib/vfs/brother120fs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" /* Number of sectors on a 120kB disk. */ static constexpr int SECTOR_COUNT = 468; diff --git a/lib/vfs/cbmfs.cc b/lib/vfs/cbmfs.cc index d17701bb..5ac64fb6 100644 --- a/lib/vfs/cbmfs.cc +++ b/lib/vfs/cbmfs.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "lib/vfs/vfs.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" enum diff --git a/lib/vfs/cpmfs.cc b/lib/vfs/cpmfs.cc index fb7c67cd..17c99e2d 100644 --- a/lib/vfs/cpmfs.cc +++ b/lib/vfs/cpmfs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "fmt/format.h" #include diff --git a/lib/vfs/fatfs.cc b/lib/vfs/fatfs.cc index c9826af5..57a59159 100644 --- a/lib/vfs/fatfs.cc +++ b/lib/vfs/fatfs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" extern "C" diff --git a/lib/vfs/fluxsectorinterface.cc b/lib/vfs/fluxsectorinterface.cc index c4ad096c..1eff8bf9 100644 --- a/lib/vfs/fluxsectorinterface.cc +++ b/lib/vfs/fluxsectorinterface.cc @@ -5,7 +5,7 @@ #include "lib/decoders/decoders.h" #include "lib/fluxsource/fluxsource.h" #include "lib/layout.h" -#include "lib/proto.h" +#include "lib/config/proto.h" class FluxSectorInterface : public SectorInterface { diff --git a/lib/vfs/lif.cc b/lib/vfs/lif.cc index 2d89d22d..cb71ac2d 100644 --- a/lib/vfs/lif.cc +++ b/lib/vfs/lif.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" #include diff --git a/lib/vfs/machfs.cc b/lib/vfs/machfs.cc index 9dc11e57..568c2f93 100644 --- a/lib/vfs/machfs.cc +++ b/lib/vfs/machfs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/vfs/applesingle.h" #include "lib/core/utils.h" diff --git a/lib/vfs/microdos.cc b/lib/vfs/microdos.cc index d95bddc9..2f363130 100644 --- a/lib/vfs/microdos.cc +++ b/lib/vfs/microdos.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" #include "fmt/format.h" diff --git a/lib/vfs/philefs.cc b/lib/vfs/philefs.cc index 78e22fda..f320ce66 100644 --- a/lib/vfs/philefs.cc +++ b/lib/vfs/philefs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" /* Root block: diff --git a/lib/vfs/prodos.cc b/lib/vfs/prodos.cc index 70b0b9d7..9dc4c322 100644 --- a/lib/vfs/prodos.cc +++ b/lib/vfs/prodos.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" /* This is described here: * http://fileformats.archiveteam.org/wiki/ProDOS_file_system diff --git a/lib/vfs/roland.cc b/lib/vfs/roland.cc index 97222155..a0ab03a5 100644 --- a/lib/vfs/roland.cc +++ b/lib/vfs/roland.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" #include diff --git a/lib/vfs/smaky6fs.cc b/lib/vfs/smaky6fs.cc index fca3d61f..1036b675 100644 --- a/lib/vfs/smaky6fs.cc +++ b/lib/vfs/smaky6fs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" /* A directory entry looks like: diff --git a/lib/vfs/vfs.cc b/lib/vfs/vfs.cc index 5af6d9e3..0d0b8298 100644 --- a/lib/vfs/vfs.cc +++ b/lib/vfs/vfs.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "vfs.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/layout.pb.h" #include "lib/layout.h" #include "lib/image.h" @@ -13,7 +13,7 @@ #include "lib/fluxsink/fluxsink.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/core/utils.h" Path::Path(const std::vector other): diff --git a/lib/vfs/zdos.cc b/lib/vfs/zdos.cc index 3a7aba73..0541e006 100644 --- a/lib/vfs/zdos.cc +++ b/lib/vfs/zdos.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include "lib/layout.h" #include diff --git a/scripts/build.py b/scripts/build.py index ce72164f..7154ddc7 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -12,7 +12,7 @@ def protoencode_single(self, name, srcs: Targets, proto, symbol): srcs=["scripts/protoencode.cc"], cflags=["-DPROTO=" + proto], deps=[ - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", "tests+test_proto_lib", @@ -62,7 +62,7 @@ cxxprogram( srcs=["./mkdoc.cc"], deps=[ "src/formats", - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", "+lib", @@ -76,7 +76,7 @@ cxxprogram( srcs=["./mkdocindex.cc"], deps=[ "src/formats", - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", "+lib", diff --git a/scripts/mkdoc.cc b/scripts/mkdoc.cc index a26ecf9a..37823e4c 100644 --- a/scripts/mkdoc.cc +++ b/scripts/mkdoc.cc @@ -1,6 +1,6 @@ #include "lib/globals.h" -#include "lib/proto.h" -#include "lib/flags.h" +#include "lib/config/proto.h" +#include "lib/config/flags.h" #include "fmt/format.h" extern const std::map formats; diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc index bdf767a0..4f8d9499 100644 --- a/scripts/mkdocindex.cc +++ b/scripts/mkdocindex.cc @@ -1,6 +1,6 @@ #include "lib/globals.h" -#include "lib/proto.h" -#include "lib/flags.h" +#include "lib/config/proto.h" +#include "lib/config/flags.h" #include "fmt/format.h" extern const std::map formats; diff --git a/scripts/protoencode.cc b/scripts/protoencode.cc index 12e4ebe9..556f425e 100644 --- a/scripts/protoencode.cc +++ b/scripts/protoencode.cc @@ -4,7 +4,7 @@ #include #include "fmt/format.h" #include "tests/testproto.pb.h" -#include "lib/config.pb.h" +#include "lib/config/config.pb.h" #include #include @@ -124,7 +124,7 @@ int main(int argc, const char* argv[]) auto name = argv[3]; output << "#include \"lib/globals.h\"\n" - << "#include \"lib/proto.h\"\n" + << "#include \"lib/config/proto.h\"\n" << "#include \n" << "static const uint8_t " << name << "_rawData[] = {"; diff --git a/src/build.py b/src/build.py index 955cd66e..df10f866 100644 --- a/src/build.py +++ b/src/build.py @@ -44,7 +44,7 @@ cxxprogram( "+lib", "lib/core", "lib/vfs", - "lib+config_proto_lib", + "lib/config", "lib/fluxsource+proto_lib", "src/formats", ], diff --git a/src/fe-analysedriveresponse.cc b/src/fe-analysedriveresponse.cc index 2293dbe1..829a8660 100644 --- a/src/fe-analysedriveresponse.cc +++ b/src/fe-analysedriveresponse.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/usb/usb.h" #include "lib/core/bitmap.h" #include "lib/fluxmap.h" #include "lib/decoders/fluxmapreader.h" #include "lib/readerwriter.h" #include "protocol.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fluxsink/fluxsink.h" #include "agg2d.h" #include "stb_image_write.h" diff --git a/src/fe-analyselayout.cc b/src/fe-analyselayout.cc index fc0f9a17..d4d64c19 100644 --- a/src/fe-analyselayout.cc +++ b/src/fe-analyselayout.cc @@ -1,7 +1,7 @@ #define _USE_MATH_DEFINES #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/core/bitmap.h" #include "lib/fluxmap.h" #include "lib/sector.h" diff --git a/src/fe-format.cc b/src/fe-format.cc index ad714ea2..172ef99f 100644 --- a/src/fe-format.cc +++ b/src/fe-format.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-getdiskinfo.cc b/src/fe-getdiskinfo.cc index ef7be7ff..bfdc82e4 100644 --- a/src/fe-getdiskinfo.cc +++ b/src/fe-getdiskinfo.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-getfile.cc b/src/fe-getfile.cc index b9bd2342..567c11f9 100644 --- a/src/fe-getfile.cc +++ b/src/fe-getfile.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-getfileinfo.cc b/src/fe-getfileinfo.cc index c9567fc7..3416acf8 100644 --- a/src/fe-getfileinfo.cc +++ b/src/fe-getfileinfo.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-inspect.cc b/src/fe-inspect.cc index c6621eb4..af9ba5a4 100644 --- a/src/fe-inspect.cc +++ b/src/fe-inspect.cc @@ -1,6 +1,6 @@ #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/readerwriter.h" #include "lib/fluxmap.h" #include "lib/decoders/fluxmapreader.h" @@ -10,7 +10,7 @@ #include "protocol.h" #include "lib/decoders/rawbits.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" static FlagGroup flags; diff --git a/src/fe-ls.cc b/src/fe-ls.cc index 52b5373b..2c289906 100644 --- a/src/fe-ls.cc +++ b/src/fe-ls.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/decoders/decoders.h" #include "lib/fluxsource/fluxsource.h" diff --git a/src/fe-merge.cc b/src/fe-merge.cc index 0c915dcb..4cb9174a 100644 --- a/src/fe-merge.cc +++ b/src/fe-merge.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/flux.h" #include "lib/fl2.h" #include "lib/fl2.pb.h" diff --git a/src/fe-mkdir.cc b/src/fe-mkdir.cc index 27dbdbd1..fe824ba2 100644 --- a/src/fe-mkdir.cc +++ b/src/fe-mkdir.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" -#include "lib/flags.h" -#include "lib/proto.h" +#include "lib/config/flags.h" +#include "lib/config/proto.h" #include "fluxengine.h" #include "lib/vfs/vfs.h" #include "lib/core/utils.h" diff --git a/src/fe-mv.cc b/src/fe-mv.cc index 5a8d45cc..2907c3a2 100644 --- a/src/fe-mv.cc +++ b/src/fe-mv.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" -#include "lib/flags.h" -#include "lib/proto.h" +#include "lib/config/flags.h" +#include "lib/config/proto.h" #include "fluxengine.h" #include "lib/vfs/vfs.h" #include "lib/core/utils.h" diff --git a/src/fe-putfile.cc b/src/fe-putfile.cc index 3846448c..d07b4c2e 100644 --- a/src/fe-putfile.cc +++ b/src/fe-putfile.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-rawread.cc b/src/fe-rawread.cc index 72ab0d65..0be078a2 100644 --- a/src/fe-rawread.cc +++ b/src/fe-rawread.cc @@ -1,11 +1,11 @@ #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/readerwriter.h" #include "lib/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fluxsink/fluxsink.h" #include "lib/fluxsource/fluxsource.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-rawwrite.cc b/src/fe-rawwrite.cc index e374a8ba..825be0e2 100644 --- a/src/fe-rawwrite.cc +++ b/src/fe-rawwrite.cc @@ -1,10 +1,10 @@ #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/readerwriter.h" #include "lib/fluxmap.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" #include "fluxengine.h" diff --git a/src/fe-read.cc b/src/fe-read.cc index 7d51a740..1d4e8b55 100644 --- a/src/fe-read.cc +++ b/src/fe-read.cc @@ -1,11 +1,11 @@ #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/readerwriter.h" #include "lib/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" #include "lib/imagewriter/imagewriter.h" diff --git a/src/fe-rm.cc b/src/fe-rm.cc index dec3229f..3bcff7cf 100644 --- a/src/fe-rm.cc +++ b/src/fe-rm.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" -#include "lib/flags.h" -#include "lib/proto.h" +#include "lib/config/flags.h" +#include "lib/config/proto.h" #include "fluxengine.h" #include "lib/vfs/vfs.h" #include "lib/core/utils.h" diff --git a/src/fe-rpm.cc b/src/fe-rpm.cc index 2fd4c45f..f54c294f 100644 --- a/src/fe-rpm.cc +++ b/src/fe-rpm.cc @@ -1,10 +1,10 @@ #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/usb/usb.h" #include "lib/fluxsource/fluxsource.h" #include "protocol.h" -#include "lib/proto.h" +#include "lib/config/proto.h" static FlagGroup flags; diff --git a/src/fe-seek.cc b/src/fe-seek.cc index 5ffd161d..8f933716 100644 --- a/src/fe-seek.cc +++ b/src/fe-seek.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/usb/usb.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "protocol.h" static FlagGroup flags; diff --git a/src/fe-testbandwidth.cc b/src/fe-testbandwidth.cc index 7d0618a3..99b58e85 100644 --- a/src/fe-testbandwidth.cc +++ b/src/fe-testbandwidth.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/usb/usb.h" static FlagGroup flags; diff --git a/src/fe-testdevices.cc b/src/fe-testdevices.cc index 373d525b..25b60920 100644 --- a/src/fe-testdevices.cc +++ b/src/fe-testdevices.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/usb/usbfinder.h" #include "fmt/format.h" diff --git a/src/fe-testvoltages.cc b/src/fe-testvoltages.cc index b5007383..7c91c3bd 100644 --- a/src/fe-testvoltages.cc +++ b/src/fe-testvoltages.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include "lib/usb/usb.h" #include "protocol.h" diff --git a/src/fe-write.cc b/src/fe-write.cc index b3dca6d6..a34a6c87 100644 --- a/src/fe-write.cc +++ b/src/fe-write.cc @@ -1,12 +1,12 @@ #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/readerwriter.h" #include "lib/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" #include "lib/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/fluxsink/fluxsink.h" #include "lib/fluxsource/fluxsource.h" #include "arch/brother/brother.h" diff --git a/src/fileutils.cc b/src/fileutils.cc index 921910e5..1553459e 100644 --- a/src/fileutils.cc +++ b/src/fileutils.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/sector.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" diff --git a/src/fluxengine.cc b/src/fluxengine.cc index 56688998..b75731ed 100644 --- a/src/fluxengine.cc +++ b/src/fluxengine.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "fmt/format.h" typedef int command_cb(int agrc, const char* argv[]); diff --git a/src/formats/build.py b/src/formats/build.py index f63d562c..30b6e350 100644 --- a/src/formats/build.py +++ b/src/formats/build.py @@ -62,7 +62,7 @@ protoencode( cxxlibrary( name="formats", srcs=[".+formats_cc", ".+table_cc"], - deps=["+lib", "lib+config_proto_lib"], + deps=["+lib", "lib/config+proto_lib"], ) export( diff --git a/src/gui/build.py b/src/gui/build.py index 6a50898e..8aa33890 100644 --- a/src/gui/build.py +++ b/src/gui/build.py @@ -66,7 +66,7 @@ cxxprogram( "+lib", "lib/core", "lib/vfs", - "lib+config_proto_lib", + "lib/config", "lib/fluxsource+proto_lib", "src/formats", "src/gui/drivetypes", diff --git a/src/gui/context.cc b/src/gui/context.cc index 55a42afc..13fec69c 100644 --- a/src/gui/context.cc +++ b/src/gui/context.cc @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "context.h" #include "gui.h" diff --git a/src/gui/explorerpanel.cc b/src/gui/explorerpanel.cc index d9542cc6..edf04d16 100644 --- a/src/gui/explorerpanel.cc +++ b/src/gui/explorerpanel.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/fluxsource/fluxsource.h" #include "lib/decoders/decoders.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "gui.h" #include "layout.h" #include "jobqueue.h" diff --git a/src/gui/idlepanel.cc b/src/gui/idlepanel.cc index 0a0c0638..67275341 100644 --- a/src/gui/idlepanel.cc +++ b/src/gui/idlepanel.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "gui.h" #include "lib/fluxmap.h" #include "lib/usb/usbfinder.h" -#include "lib/proto.h" -#include "lib/flags.h" +#include "lib/config/proto.h" +#include "lib/config/flags.h" #include "lib/core/utils.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" diff --git a/src/gui/imagerpanel.cc b/src/gui/imagerpanel.cc index 160afad2..7280e05d 100644 --- a/src/gui/imagerpanel.cc +++ b/src/gui/imagerpanel.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/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" @@ -7,7 +7,7 @@ #include "lib/imagewriter/imagewriter.h" #include "lib/encoders/encoders.h" #include "lib/decoders/decoders.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/readerwriter.h" #include "gui.h" #include "lib/layout.h" diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc index 5c55c587..4aa2e85d 100644 --- a/src/gui/mainwindow.cc +++ b/src/gui/mainwindow.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 "gui.h" #include "lib/core/logger.h" #include "lib/readerwriter.h" diff --git a/src/readibm.h b/src/readibm.h index 9bdfb33f..d7b71e7d 100644 --- a/src/readibm.h +++ b/src/readibm.h @@ -1,7 +1,7 @@ #ifndef READIBM_H #define READIBM_H -#include "lib/flags.h" +#include "lib/config/flags.h" #include "dataspec.h" extern IntFlag sectorIdBase; diff --git a/tests/build.py b/tests/build.py index eee064e8..907ebcbe 100644 --- a/tests/build.py +++ b/tests/build.py @@ -8,7 +8,7 @@ from scripts.build import protoencode_single proto(name="test_proto", srcs=["./testproto.proto"], deps=["lib+common_proto"]) protocc( - name="test_proto_lib", srcs=[".+test_proto"], deps=["lib+config_proto_lib"] + name="test_proto_lib", srcs=[".+test_proto"], deps=["lib/config+proto_lib"] ) tests = [ @@ -68,7 +68,7 @@ export( "dep/libusbp", "dep/snowhouse", "dep/stb", - "lib+config_proto_lib", + "lib/config", "src/formats", ], ), @@ -97,7 +97,7 @@ export( "dep/snowhouse", "dep/stb", "arch+proto_lib", - "lib+config_proto_lib", + "lib/config", "src/formats", ] + ([".+test_proto_lib"] if n == "options" else []) diff --git a/tests/configs.cc b/tests/configs.cc index 8d4c8691..90b8b141 100644 --- a/tests/configs.cc +++ b/tests/configs.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" -#include "lib/proto.h" -#include "lib/flags.h" +#include "lib/config/proto.h" +#include "lib/config/flags.h" #include "lib/core/bytes.h" #include "fmt/format.h" diff --git a/tests/cpmfs.cc b/tests/cpmfs.cc index 9df8cded..071e8900 100644 --- a/tests/cpmfs.cc +++ b/tests/cpmfs.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "lib/vfs/vfs.h" #include "lib/vfs/sectorinterface.h" #include "lib/vfs/vfs.pb.h" #include "lib/image.h" -#include "lib/proto.h" +#include "lib/config/proto.h" #include "lib/sector.h" #include "snowhouse/snowhouse.h" #include diff --git a/tests/flags.cc b/tests/flags.cc index 5dc5bcee..161e7f8d 100644 --- a/tests/flags.cc +++ b/tests/flags.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/flags.h" +#include "lib/config/flags.h" #include static void testDefaultIntValue() diff --git a/tests/layout.cc b/tests/layout.cc index 34faa314..86b4bb62 100644 --- a/tests/layout.cc +++ b/tests/layout.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/core/bytes.h" -#include "lib/config.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include "lib/layout.h" #include "snowhouse/snowhouse.h" #include diff --git a/tests/options.cc b/tests/options.cc index 47d80221..547e9021 100644 --- a/tests/options.cc +++ b/tests/options.cc @@ -1,9 +1,9 @@ #include "lib/core/globals.h" #include "lib/core/bytes.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "tests/testproto.pb.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include "snowhouse/snowhouse.h" #include #include diff --git a/tests/proto.cc b/tests/proto.cc index 2e69645e..ecb536ea 100644 --- a/tests/proto.cc +++ b/tests/proto.cc @@ -1,8 +1,8 @@ #include "lib/core/globals.h" #include "lib/core/bytes.h" #include "tests/testproto.pb.h" -#include "lib/config.pb.h" -#include "lib/proto.h" +#include "lib/config/config.pb.h" +#include "lib/config/proto.h" #include "snowhouse/snowhouse.h" #include #include diff --git a/tests/vfs.cc b/tests/vfs.cc index 3c524c0c..27df49dc 100644 --- a/tests/vfs.cc +++ b/tests/vfs.cc @@ -1,5 +1,5 @@ #include "lib/core/globals.h" -#include "lib/config.h" +#include "lib/config/config.h" #include "lib/vfs/vfs.h" #include "snowhouse/snowhouse.h" diff --git a/tools/build.py b/tools/build.py index adc55523..e855ed99 100644 --- a/tools/build.py +++ b/tools/build.py @@ -11,7 +11,7 @@ cxxprogram( deps=[ "+lib", "lib/core", - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "+fmt_lib", "+z_lib", @@ -25,7 +25,7 @@ cxxprogram( deps=[ "+lib", "lib/core", - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "+fmt_lib", "+z_lib", @@ -45,7 +45,7 @@ cxxprogram( "+sqlite3_lib", "+z_lib", "dep/libusbp", - "lib+config_proto_lib", + "lib/config+proto_lib", "lib/fluxsource+proto_lib", "src/formats", "lib/core",