From 7983a4b88362114242307263e4d02a6ef844cbc6 Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 15 Oct 2024 00:46:46 +0200 Subject: [PATCH] Move the external file format stuff into its own module. --- build.py | 14 +---- lib/build.py | 12 +++-- lib/config/build.py | 5 +- lib/core/utils.cc | 17 ++++++ lib/drive.proto | 2 +- lib/{ => external}/a2r.h | 0 lib/external/build.py | 20 +++++++ lib/{ => external}/fl2.cc | 3 +- lib/{ => external}/fl2.h | 0 lib/{ => external}/fl2.proto | 0 lib/{ => external}/ldbs.cc | 2 +- lib/{ => external}/ldbs.h | 0 lib/{ => external}/scp.h | 0 lib/fluxsink/a2rfluxsink.cc | 2 +- lib/fluxsink/fl2fluxsink.cc | 4 +- lib/fluxsink/scpfluxsink.cc | 2 +- lib/fluxsource/fl2fluxsource.cc | 4 +- lib/fluxsource/scpfluxsource.cc | 2 +- lib/globals.cc | 17 ------ lib/globals.h | 72 -------------------------- lib/imagewriter/d64imagewriter.cc | 2 +- lib/imagewriter/diskcopyimagewriter.cc | 2 +- lib/imagewriter/ldbsimagewriter.cc | 2 +- lib/layout.proto | 2 +- lib/usb/applesauceusb.cc | 2 +- lib/vfs/build.py | 4 +- scripts/build.py | 3 -- scripts/mkdoc.cc | 2 +- scripts/mkdocindex.cc | 2 +- scripts/protoencode.cc | 2 +- src/build.py | 9 ++-- src/fe-merge.cc | 4 +- src/formats/build.py | 2 +- src/gui/build.py | 2 +- tests/build.py | 4 +- tests/ldbs.cc | 2 +- tools/brother120tool.cc | 2 +- tools/brother240tool.cc | 2 +- tools/build.py | 20 +++---- tools/upgrade-flux-file.cc | 2 +- 40 files changed, 96 insertions(+), 154 deletions(-) rename lib/{ => external}/a2r.h (100%) create mode 100644 lib/external/build.py rename lib/{ => external}/fl2.cc (97%) rename lib/{ => external}/fl2.h (100%) rename lib/{ => external}/fl2.proto (100%) rename lib/{ => external}/ldbs.cc (98%) rename lib/{ => external}/ldbs.h (100%) rename lib/{ => external}/scp.h (100%) delete mode 100644 lib/globals.cc delete mode 100644 lib/globals.h diff --git a/build.py b/build.py index ea3b5d0f..b5b9e929 100644 --- a/build.py +++ b/build.py @@ -19,14 +19,10 @@ hostpackage(name="sqlite3_host_lib", package="sqlite3") clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"}) -proto(name="fl2_proto", srcs=["lib/fl2.proto"]) -protocc(name="fl2_proto_lib", srcs=["+fl2_proto"]) - cxxlibrary( name="lib", srcs=[ "./lib/decoders/decoders.cc", - "./lib/fl2.cc", "./lib/decoders/fluxdecoder.cc", "./lib/decoders/fmmfm.cc", "./lib/encoders/encoders.cc", @@ -52,7 +48,6 @@ cxxlibrary( "./lib/fluxsource/memoryfluxsource.cc", "./lib/fluxsource/scpfluxsource.cc", "./lib/fluxsource/testpatternfluxsource.cc", - "./lib/globals.cc", "./lib/imagereader/d64imagereader.cc", "./lib/imagereader/d88imagereader.cc", "./lib/imagereader/dimimagereader.cc", @@ -74,7 +69,6 @@ cxxlibrary( "./lib/imagewriter/ldbsimagewriter.cc", "./lib/imagewriter/nsiimagewriter.cc", "./lib/imagewriter/rawimagewriter.cc", - "./lib/ldbs.cc", "./lib/readerwriter.cc", "./lib/usb/applesauceusb.cc", "./lib/usb/fluxengineusb.cc", @@ -145,22 +139,17 @@ cxxlibrary( "arch/c64/data_gcr.h": "./arch/c64/data_gcr.h", "arch/c64/c64.h": "./arch/c64/c64.h", "arch/tartu/tartu.h": "./arch/tartu/tartu.h", - "lib/a2r.h": "./lib/a2r.h", "lib/decoders/decoders.h": "./lib/decoders/decoders.h", "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h", "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h", "lib/encoders/encoders.h": "./lib/encoders/encoders.h", - "lib/scp.h": "./lib/scp.h", - "lib/fl2.h": "./lib/fl2.h", "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h", "lib/fluxsource/catweasel.h": "lib/fluxsource/catweasel.h", "lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h", "lib/fluxsource/flx.h": "lib/fluxsource/flx.h", "lib/fluxsource/kryoflux.h": "lib/fluxsource/kryoflux.h", - "lib/globals.h": "./lib/globals.h", "lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h", "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h", - "lib/ldbs.h": "./lib/ldbs.h", "lib/readerwriter.h": "./lib/readerwriter.h", "lib/usb/applesauce.h": "./lib/usb/applesauce.h", "lib/usb/greaseweazle.h": "./lib/usb/greaseweazle.h", @@ -168,7 +157,6 @@ cxxlibrary( "lib/usb/usbfinder.h": "./lib/usb/usbfinder.h", }, deps=[ - "+fl2_proto_lib", "+fmt_lib", "+protocol", "dep/adflib", @@ -176,9 +164,11 @@ cxxlibrary( "dep/hfsutils", "dep/libusbp", "dep/stb", + "src/formats", "lib/core", "lib/config", "lib/data", + "lib/external", "lib/fluxsource+proto_lib", ], ) diff --git a/lib/build.py b/lib/build.py index 925fa1c0..a04a6e21 100644 --- a/lib/build.py +++ b/lib/build.py @@ -7,21 +7,25 @@ protocc(name="common_proto_lib", srcs=[".+common_proto"]) proto( name="layout_proto", srcs=["./layout.proto"], - deps=[".+common_proto", "+fl2_proto"], + deps=[".+common_proto", "lib/external+fl2_proto"], ) protocc( name="layout_proto_lib", srcs=[".+layout_proto"], - deps=[".+common_proto_lib", "+fl2_proto_lib"], + deps=[".+common_proto_lib", "lib/external+fl2_proto_lib"], ) proto( name="drive_proto", srcs=["./drive.proto"], - deps=[".+common_proto", "+fl2_proto", ".+layout_proto"], + deps=[".+common_proto", "lib/external+fl2_proto", ".+layout_proto"], ) protocc( name="drive_proto_lib", srcs=[".+drive_proto"], - deps=[".+common_proto_lib", "+fl2_proto_lib", ".+layout_proto_lib"], + deps=[ + ".+common_proto_lib", + "lib/external+fl2_proto_lib", + ".+layout_proto_lib", + ], ) diff --git a/lib/config/build.py b/lib/config/build.py index aabd54a4..fe58671a 100644 --- a/lib/config/build.py +++ b/lib/config/build.py @@ -8,7 +8,7 @@ proto( "lib+common_proto", "lib+layout_proto", "lib+drive_proto", - "+fl2_proto", + "lib/external+fl2_proto", "lib/fluxsource+proto", "lib/fluxsink+proto", "lib/vfs+proto", @@ -22,7 +22,7 @@ proto( protocc( name="proto_lib", - srcs=[".+proto", "arch+proto", "+fl2_proto"], + srcs=[".+proto", "arch+proto"], deps=[ "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", @@ -32,6 +32,7 @@ protocc( "lib/decoders+proto_lib", "lib/imagereader+proto_lib", "lib/imagewriter+proto_lib", + "lib/external+fl2_proto_lib", "lib+drive_proto_lib", ], ) diff --git a/lib/core/utils.cc b/lib/core/utils.cc index c73c86e9..30c30299 100644 --- a/lib/core/utils.cc +++ b/lib/core/utils.cc @@ -1,8 +1,11 @@ #include "lib/core/globals.h" #include "lib/core/utils.h" #include "lib/core/bytes.h" +#include "lib/core/logger.h" #include #include +#include +#include bool emergencyStop = false; @@ -233,3 +236,17 @@ int findLowestSetBit(uint64_t value) } return bit; } + +double getCurrentTime(void) +{ + struct timeval tv; + gettimeofday(&tv, NULL); + + return double(tv.tv_sec) + tv.tv_usec / 1000000.0; +} + +void warning(const std::string msg) +{ + log(msg); +} + diff --git a/lib/drive.proto b/lib/drive.proto index 6bbe1766..373400ff 100644 --- a/lib/drive.proto +++ b/lib/drive.proto @@ -1,7 +1,7 @@ syntax = "proto2"; import "lib/common.proto"; -import "lib/fl2.proto"; +import "lib/external/fl2.proto"; // Next: 15 message DriveProto diff --git a/lib/a2r.h b/lib/external/a2r.h similarity index 100% rename from lib/a2r.h rename to lib/external/a2r.h diff --git a/lib/external/build.py b/lib/external/build.py new file mode 100644 index 00000000..94ff96ee --- /dev/null +++ b/lib/external/build.py @@ -0,0 +1,20 @@ +from build.c import cxxlibrary +from build.protobuf import proto, protocc + +proto(name="fl2_proto", srcs=["./fl2.proto"]) +protocc(name="fl2_proto_lib", srcs=[".+fl2_proto"]) + +cxxlibrary( + name="external", + srcs=[ + "./ldbs.cc", + "./fl2.cc", + ], + hdrs={ + "lib/external/ldbs.h": "./ldbs.h", + "lib/external/a2r.h": "./a2r.h", + "lib/external/scp.h": "./scp.h", + "lib/external/fl2.h": "./fl2.h", + }, + deps=["lib/core", ".+fl2_proto_lib", "lib/data"], +) diff --git a/lib/fl2.cc b/lib/external/fl2.cc similarity index 97% rename from lib/fl2.cc rename to lib/external/fl2.cc index a167df30..4392603b 100644 --- a/lib/fl2.cc +++ b/lib/external/fl2.cc @@ -1,7 +1,6 @@ #include "lib/core/globals.h" -#include "lib/config/proto.h" #include "lib/data/fluxmap.h" -#include "lib/fl2.pb.h" +#include "lib/external/fl2.pb.h" #include static void upgradeFluxFile(FluxFileProto& proto) diff --git a/lib/fl2.h b/lib/external/fl2.h similarity index 100% rename from lib/fl2.h rename to lib/external/fl2.h diff --git a/lib/fl2.proto b/lib/external/fl2.proto similarity index 100% rename from lib/fl2.proto rename to lib/external/fl2.proto diff --git a/lib/ldbs.cc b/lib/external/ldbs.cc similarity index 98% rename from lib/ldbs.cc rename to lib/external/ldbs.cc index 6a3d0ddd..277a070d 100644 --- a/lib/ldbs.cc +++ b/lib/external/ldbs.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include #include "lib/core/bytes.h" -#include "lib/ldbs.h" +#include "lib/external/ldbs.h" LDBS::LDBS() {} diff --git a/lib/ldbs.h b/lib/external/ldbs.h similarity index 100% rename from lib/ldbs.h rename to lib/external/ldbs.h diff --git a/lib/scp.h b/lib/external/scp.h similarity index 100% rename from lib/scp.h rename to lib/external/scp.h diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc index fa240b65..bb5de569 100644 --- a/lib/fluxsink/a2rfluxsink.cc +++ b/lib/fluxsink/a2rfluxsink.cc @@ -10,7 +10,7 @@ #include "lib/config/proto.h" #include "lib/data/fluxmap.h" #include "lib/data/layout.h" -#include "lib/a2r.h" +#include "lib/external/a2r.h" #include #include #include diff --git a/lib/fluxsink/fl2fluxsink.cc b/lib/fluxsink/fl2fluxsink.cc index aa82d5cb..43da9a9c 100644 --- a/lib/fluxsink/fl2fluxsink.cc +++ b/lib/fluxsink/fl2fluxsink.cc @@ -8,8 +8,8 @@ #include "lib/data/fluxmapreader.h" #include "lib/fluxsink/fluxsink.pb.h" #include "lib/config/proto.h" -#include "lib/fl2.pb.h" -#include "lib/fl2.h" +#include "lib/external/fl2.pb.h" +#include "lib/external/fl2.h" #include #include #include diff --git a/lib/fluxsink/scpfluxsink.cc b/lib/fluxsink/scpfluxsink.cc index 625723e5..ec489ae9 100644 --- a/lib/fluxsink/scpfluxsink.cc +++ b/lib/fluxsink/scpfluxsink.cc @@ -10,7 +10,7 @@ #include "lib/config/proto.h" #include "lib/data/fluxmap.h" #include "lib/data/layout.h" -#include "lib/scp.h" +#include "lib/external/scp.h" #include "lib/core/logger.h" #include #include diff --git a/lib/fluxsource/fl2fluxsource.cc b/lib/fluxsource/fl2fluxsource.cc index 521e236d..1fb8227e 100644 --- a/lib/fluxsource/fl2fluxsource.cc +++ b/lib/fluxsource/fl2fluxsource.cc @@ -1,10 +1,10 @@ #include "lib/core/globals.h" #include "lib/data/fluxmap.h" #include "lib/fluxsource/fluxsource.pb.h" -#include "lib/fl2.pb.h" +#include "lib/external/fl2.pb.h" #include "lib/fluxsource/fluxsource.h" #include "lib/config/proto.h" -#include "lib/fl2.h" +#include "lib/external/fl2.h" #include "lib/data/fluxmap.h" #include diff --git a/lib/fluxsource/scpfluxsource.cc b/lib/fluxsource/scpfluxsource.cc index de4dd02f..00b64179 100644 --- a/lib/fluxsource/scpfluxsource.cc +++ b/lib/fluxsource/scpfluxsource.cc @@ -4,7 +4,7 @@ #include "lib/fluxsource/fluxsource.pb.h" #include "lib/core/utils.h" #include "lib/fluxsource/fluxsource.h" -#include "lib/scp.h" +#include "lib/external/scp.h" #include "lib/config/proto.h" #include "lib/core/logger.h" #include diff --git a/lib/globals.cc b/lib/globals.cc deleted file mode 100644 index e02b2807..00000000 --- a/lib/globals.cc +++ /dev/null @@ -1,17 +0,0 @@ -#include "lib/core/globals.h" -#include "lib/core/logger.h" -#include -#include - -double getCurrentTime(void) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - - return double(tv.tv_sec) + tv.tv_usec / 1000000.0; -} - -void warning(const std::string msg) -{ - log(msg); -} diff --git a/lib/globals.h b/lib/globals.h deleted file mode 100644 index b8c88092..00000000 --- a/lib/globals.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef GLOBALS_H -#define GLOBALS_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "fmt/format.h" - -#if defined(_WIN32) || defined(__WIN32__) -#include -#define mkdir(A, B) _mkdir(A) -#endif - -template -static inline std::vector vector_of(T item) -{ - return std::vector{item}; -} - -typedef double nanoseconds_t; -class Bytes; - -extern double getCurrentTime(); -extern void hexdump(std::ostream& stream, const Bytes& bytes); -extern void hexdumpForSrp16(std::ostream& stream, const Bytes& bytes); - -struct ErrorException -{ - ErrorException(const std::string& message): message(message) {} - - const std::string message; - - void print() const; -}; - -template -[[noreturn]] inline void error(fmt::string_view fstr, const Args&... args) -{ - throw ErrorException{fmt::format(fstr, args...)}; -} - -extern void warning(const std::string msg); - -template -inline void warning(fmt::string_view fstr, const Args&... args) -{ - warning(fmt::format(fstr, args...)); -} - -template -struct overloaded : Ts... -{ - using Ts::operator()...; -}; -template -overloaded(Ts...) -> overloaded; - -#include "lib/config/config.h" - -#endif diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc index 1b4ebb14..0a102899 100644 --- a/lib/imagewriter/d64imagewriter.cc +++ b/lib/imagewriter/d64imagewriter.cc @@ -3,7 +3,7 @@ #include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" #include "lib/data/image.h" -#include "lib/ldbs.h" +#include "lib/external/ldbs.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" #include diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc index 0f66ba44..dbabe43e 100644 --- a/lib/imagewriter/diskcopyimagewriter.cc +++ b/lib/imagewriter/diskcopyimagewriter.cc @@ -2,7 +2,7 @@ #include "lib/config/flags.h" #include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/ldbs.h" +#include "lib/external/ldbs.h" #include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc index 750e55c2..728244d1 100644 --- a/lib/imagewriter/ldbsimagewriter.cc +++ b/lib/imagewriter/ldbsimagewriter.cc @@ -2,7 +2,7 @@ #include "lib/config/flags.h" #include "lib/data/sector.h" #include "lib/imagewriter/imagewriter.h" -#include "lib/ldbs.h" +#include "lib/external/ldbs.h" #include "lib/data/image.h" #include "lib/core/logger.h" #include "lib/config/config.pb.h" diff --git a/lib/layout.proto b/lib/layout.proto index edd33cca..2bf78943 100644 --- a/lib/layout.proto +++ b/lib/layout.proto @@ -1,7 +1,7 @@ syntax = "proto2"; import "lib/common.proto"; -import "lib/fl2.proto"; +import "lib/external/fl2.proto"; message SectorListProto { diff --git a/lib/usb/applesauceusb.cc b/lib/usb/applesauceusb.cc index 19788834..fd27b2bc 100644 --- a/lib/usb/applesauceusb.cc +++ b/lib/usb/applesauceusb.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "protocol.h" #include "lib/data/fluxmap.h" #include "lib/core/bytes.h" diff --git a/lib/vfs/build.py b/lib/vfs/build.py index 94a8a090..a4d78068 100644 --- a/lib/vfs/build.py +++ b/lib/vfs/build.py @@ -4,7 +4,7 @@ from build.protobuf import proto, protocc proto( name="proto", srcs=["./vfs.proto"], - deps=["lib+common_proto", "lib+layout_proto", "+fl2_proto"], + deps=["lib+common_proto", "lib+layout_proto", "lib/external+fl2_proto"], ) protocc( @@ -13,7 +13,7 @@ protocc( deps=[ "lib+common_proto_lib", "lib+layout_proto_lib", - "+fl2_proto_lib", + "lib/external+fl2_proto_lib", ], ) diff --git a/scripts/build.py b/scripts/build.py index 7154ddc7..fd894142 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -18,7 +18,6 @@ def protoencode_single(self, name, srcs: Targets, proto, symbol): "tests+test_proto_lib", "+protobuf_lib", "+fmt_lib", - "+lib", ], ) encoders[proto] = r @@ -65,7 +64,6 @@ cxxprogram( "lib/config+proto_lib", "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", - "+lib", "+fmt_lib", "+protobuf_lib", ], @@ -79,7 +77,6 @@ cxxprogram( "lib/config+proto_lib", "lib/fluxsource+proto_lib", "lib/fluxsink+proto_lib", - "+lib", "+fmt_lib", "+protobuf_lib", ], diff --git a/scripts/mkdoc.cc b/scripts/mkdoc.cc index 37823e4c..a116134e 100644 --- a/scripts/mkdoc.cc +++ b/scripts/mkdoc.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "lib/config/proto.h" #include "lib/config/flags.h" #include "fmt/format.h" diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc index 4f8d9499..43d3fb69 100644 --- a/scripts/mkdocindex.cc +++ b/scripts/mkdocindex.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "lib/config/proto.h" #include "lib/config/flags.h" #include "fmt/format.h" diff --git a/scripts/protoencode.cc b/scripts/protoencode.cc index 556f425e..09da18ef 100644 --- a/scripts/protoencode.cc +++ b/scripts/protoencode.cc @@ -123,7 +123,7 @@ int main(int argc, const char* argv[]) auto data = message.SerializeAsString(); auto name = argv[3]; - output << "#include \"lib/globals.h\"\n" + output << "#include \"lib/core/globals.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 9817a746..9692c6cd 100644 --- a/src/build.py +++ b/src/build.py @@ -30,8 +30,9 @@ cxxprogram( ], cflags=["-I."], deps=[ - "+fl2_proto_lib", "+fmt_lib", + "+lib", + "+protobuf_lib", "+protobuf_lib", "+protocol", "+z_lib", @@ -41,12 +42,12 @@ cxxprogram( "dep/hfsutils", "dep/libusbp", "dep/stb", - "+lib", + "lib/config", "lib/core", "lib/data", - "lib/vfs", - "lib/config", + "lib/external", "lib/fluxsource+proto_lib", + "lib/vfs", "src/formats", ], ) diff --git a/src/fe-merge.cc b/src/fe-merge.cc index e971f4e7..44e9d9ff 100644 --- a/src/fe-merge.cc +++ b/src/fe-merge.cc @@ -4,8 +4,8 @@ #include "lib/data/sector.h" #include "lib/config/proto.h" #include "lib/data/flux.h" -#include "lib/fl2.h" -#include "lib/fl2.pb.h" +#include "lib/external/fl2.h" +#include "lib/external/fl2.pb.h" #include "src/fluxengine.h" #include diff --git a/src/formats/build.py b/src/formats/build.py index 30b6e350..c1f67a14 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/config", "lib/core"], ) export( diff --git a/src/gui/build.py b/src/gui/build.py index 8daca832..eb925753 100644 --- a/src/gui/build.py +++ b/src/gui/build.py @@ -56,7 +56,7 @@ cxxprogram( cflags=["$(WX_CFLAGS)"], ldflags=["$(WX_LDFLAGS)"], deps=[ - "+fl2_proto_lib", + "lib/external+fl2_proto_lib", "+protocol", "dep/adflib", "dep/fatfs", diff --git a/tests/build.py b/tests/build.py index 926c37af..423b554e 100644 --- a/tests/build.py +++ b/tests/build.py @@ -52,7 +52,7 @@ export( ), ], deps=[ - "+fl2_proto_lib", + "lib/external+fl2_proto_lib", "+fmt_lib", "+lib", "+protobuf_lib", @@ -82,7 +82,7 @@ export( name=f"{n}_test_exe", srcs=[f"./{n}.cc"], deps=[ - "+fl2_proto_lib", + "lib/external+fl2_proto_lib", "+fmt_lib", "+lib", "+protobuf_lib", diff --git a/tests/ldbs.cc b/tests/ldbs.cc index 21c18871..66cb1e16 100644 --- a/tests/ldbs.cc +++ b/tests/ldbs.cc @@ -3,7 +3,7 @@ #include #include "lib/core/globals.h" #include "lib/core/bytes.h" -#include "lib/ldbs.h" +#include "lib/external/ldbs.h" static Bytes testdata{ // clang-format off diff --git a/tools/brother120tool.cc b/tools/brother120tool.cc index 24abae7a..85c38e23 100644 --- a/tools/brother120tool.cc +++ b/tools/brother120tool.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "lib/core/bytes.h" #include "fmt/format.h" #include "lib/core/utils.h" diff --git a/tools/brother240tool.cc b/tools/brother240tool.cc index 9cfbcac6..93b88ad3 100644 --- a/tools/brother240tool.cc +++ b/tools/brother240tool.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "fmt/format.h" #include diff --git a/tools/build.py b/tools/build.py index 0b939f40..a0f1c4c2 100644 --- a/tools/build.py +++ b/tools/build.py @@ -9,13 +9,14 @@ cxxprogram( name="brother120tool", srcs=["./brother120tool.cc"], deps=[ + "+fmt_lib", "+lib", + "+protobuf_lib", + "+z_lib", + "lib/config", "lib/core", "lib/data", - "lib/config+proto_lib", "lib/fluxsource+proto_lib", - "+fmt_lib", - "+z_lib", ] + emu, ) @@ -24,13 +25,14 @@ cxxprogram( name="brother240tool", srcs=["./brother240tool.cc"], deps=[ + "+fmt_lib", "+lib", + "+protobuf_lib", + "+z_lib", + "lib/config", "lib/core", "lib/data", - "lib/config+proto_lib", "lib/fluxsource+proto_lib", - "+fmt_lib", - "+z_lib", ] + emu, ) @@ -39,7 +41,6 @@ cxxprogram( name="upgrade-flux-file", srcs=["./upgrade-flux-file.cc"], deps=[ - "+fl2_proto_lib", "+fmt_lib", "+lib", "+protobuf_lib", @@ -48,9 +49,10 @@ cxxprogram( "+z_lib", "dep/libusbp", "lib/config+proto_lib", - "lib/fluxsource+proto_lib", - "src/formats", "lib/core", "lib/data", + "lib/external+fl2_proto_lib", + "lib/fluxsource+proto_lib", + "src/formats", ], ) diff --git a/tools/upgrade-flux-file.cc b/tools/upgrade-flux-file.cc index 47c7894e..8e5a6e8c 100644 --- a/tools/upgrade-flux-file.cc +++ b/tools/upgrade-flux-file.cc @@ -1,4 +1,4 @@ -#include "lib/globals.h" +#include "lib/core/globals.h" #include "lib/data/fluxmap.h" #include "lib/fluxsink/fluxsink.h" #include "lib/core/bytes.h"