From ed604f62840379c8d5b5b1aad491402120f61800 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 19 Oct 2024 13:18:28 +0200 Subject: [PATCH] Finally eliminate the +lib target. --- build.py | 30 ---------------------------- lib/algorithms/build.py | 21 +++++++++++++++++++ lib/{ => algorithms}/readerwriter.cc | 2 +- lib/{ => algorithms}/readerwriter.h | 0 lib/vfs/build.py | 5 ++++- lib/vfs/fluxsectorinterface.cc | 2 +- src/build.py | 2 +- src/fe-putfile.cc | 2 +- src/fe-rawread.cc | 2 +- src/fe-rawwrite.cc | 2 +- src/fe-read.cc | 2 +- src/fe-write.cc | 2 +- src/fileutils.cc | 2 +- src/gui/build.py | 1 - src/gui/drivetypes/build.py | 2 +- src/gui/imagerpanel.cc | 2 +- src/gui/mainwindow.cc | 2 +- tests/build.py | 3 +-- tools/build.py | 8 +++++--- 19 files changed, 43 insertions(+), 49 deletions(-) create mode 100644 lib/algorithms/build.py rename lib/{ => algorithms}/readerwriter.cc (99%) rename lib/{ => algorithms}/readerwriter.h (100%) diff --git a/build.py b/build.py index 4d7fcc2c..2c10acfd 100644 --- a/build.py +++ b/build.py @@ -19,36 +19,6 @@ hostpackage(name="sqlite3_host_lib", package="sqlite3") clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"}) -cxxlibrary( - name="lib", - srcs=[ - "./lib/readerwriter.cc", - ], - hdrs={ - "lib/readerwriter.h": "./lib/readerwriter.h", - }, - deps=[ - "+fmt_lib", - "+protocol", - "dep/adflib", - "dep/fatfs", - "dep/hfsutils", - "dep/libusbp", - "dep/stb", - "src/formats", - "lib/core", - "lib/config", - "lib/data", - "lib/external", - "lib/fluxsink", - "lib/fluxsource", - "lib/imagereader", - "lib/imagewriter", - "lib/decoders", - "lib/encoders", - ], -) - corpustests = [] if not glob("../fluxengine-testdata/data"): print("fluxengine-testdata not found; skipping corpus tests") diff --git a/lib/algorithms/build.py b/lib/algorithms/build.py new file mode 100644 index 00000000..e436aac8 --- /dev/null +++ b/lib/algorithms/build.py @@ -0,0 +1,21 @@ +from build.c import cxxlibrary + +cxxlibrary( + name="algorithms", + srcs=["./readerwriter.cc"], + hdrs={ + "lib/algorithms/readerwriter.h": "./readerwriter.h", + }, + deps=[ + "lib/core", + "lib/config", + "lib/data", + "lib/usb", + "lib/encoders", + "lib/decoders", + "lib/fluxsource", + "lib/fluxsink", + "lib/imagereader", + "lib/imagewriter", + ], +) diff --git a/lib/readerwriter.cc b/lib/algorithms/readerwriter.cc similarity index 99% rename from lib/readerwriter.cc rename to lib/algorithms/readerwriter.cc index fc0bf839..2c8d485a 100644 --- a/lib/readerwriter.cc +++ b/lib/algorithms/readerwriter.cc @@ -2,7 +2,7 @@ #include "lib/config/config.h" #include "lib/config/flags.h" #include "lib/data/fluxmap.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "protocol.h" #include "lib/usb/usb.h" #include "lib/encoders/encoders.h" diff --git a/lib/readerwriter.h b/lib/algorithms/readerwriter.h similarity index 100% rename from lib/readerwriter.h rename to lib/algorithms/readerwriter.h diff --git a/lib/vfs/build.py b/lib/vfs/build.py index 4398869e..148d2ddd 100644 --- a/lib/vfs/build.py +++ b/lib/vfs/build.py @@ -46,9 +46,12 @@ cxxlibrary( "lib/vfs/vfs.h": "./vfs.h", }, deps=[ - "+lib", "+fmt_lib", "arch", + "lib/algorithms", ".+proto_lib", + "dep/hfsutils", + "dep/adflib", + "dep/fatfs", ], ) diff --git a/lib/vfs/fluxsectorinterface.cc b/lib/vfs/fluxsectorinterface.cc index c3f5ea58..c14584a1 100644 --- a/lib/vfs/fluxsectorinterface.cc +++ b/lib/vfs/fluxsectorinterface.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/vfs/sectorinterface.h" #include "lib/data/image.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/decoders/decoders.h" #include "lib/fluxsource/fluxsource.h" #include "lib/data/layout.h" diff --git a/src/build.py b/src/build.py index 2d29420f..68bd0362 100644 --- a/src/build.py +++ b/src/build.py @@ -31,7 +31,6 @@ cxxprogram( cflags=["-I."], deps=[ "+fmt_lib", - "+lib", "+protobuf_lib", "+protocol", "+z_lib", @@ -46,6 +45,7 @@ cxxprogram( "lib/data", "lib/external", "lib/vfs", + "lib/algorithms", "arch", "src/formats", ], diff --git a/src/fe-putfile.cc b/src/fe-putfile.cc index 704663bc..874e19b0 100644 --- a/src/fe-putfile.cc +++ b/src/fe-putfile.cc @@ -3,7 +3,7 @@ #include "lib/data/fluxmap.h" #include "lib/data/sector.h" #include "lib/config/proto.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/imagereader/imagereader.h" #include "lib/imagewriter/imagewriter.h" #include "lib/fluxsource/fluxsource.h" diff --git a/src/fe-rawread.cc b/src/fe-rawread.cc index d4e14b44..07c8c56a 100644 --- a/src/fe-rawread.cc +++ b/src/fe-rawread.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/data/sector.h" diff --git a/src/fe-rawwrite.cc b/src/fe-rawwrite.cc index 9c8ea290..c0fef3e9 100644 --- a/src/fe-rawwrite.cc +++ b/src/fe-rawwrite.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/data/fluxmap.h" #include "lib/data/sector.h" #include "lib/config/proto.h" diff --git a/src/fe-read.cc b/src/fe-read.cc index 80df542a..6bb795ae 100644 --- a/src/fe-read.cc +++ b/src/fe-read.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/data/sector.h" diff --git a/src/fe-write.cc b/src/fe-write.cc index 5b73261f..d9e0a854 100644 --- a/src/fe-write.cc +++ b/src/fe-write.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/config/config.h" #include "lib/config/flags.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/data/fluxmap.h" #include "lib/decoders/decoders.h" #include "lib/encoders/encoders.h" diff --git a/src/fileutils.cc b/src/fileutils.cc index f588d05f..87e19b39 100644 --- a/src/fileutils.cc +++ b/src/fileutils.cc @@ -4,7 +4,7 @@ #include "lib/data/fluxmap.h" #include "lib/data/sector.h" #include "lib/config/proto.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" #include "lib/imagereader/imagereader.h" diff --git a/src/gui/build.py b/src/gui/build.py index 1f4e3595..f64ffcd3 100644 --- a/src/gui/build.py +++ b/src/gui/build.py @@ -63,7 +63,6 @@ cxxprogram( "dep/hfsutils", "dep/libusbp", "extras+icons", - "+lib", "lib/core", "lib/data", "lib/vfs", diff --git a/src/gui/drivetypes/build.py b/src/gui/drivetypes/build.py index 4314afdf..c5f5d645 100644 --- a/src/gui/drivetypes/build.py +++ b/src/gui/drivetypes/build.py @@ -32,5 +32,5 @@ protoencode( cxxlibrary( name="drivetypes", srcs=[".+drivetypes_cc", ".+drivetypes_table_cc"], - deps=["+lib"], + deps=["lib/core", "lib/config"], ) diff --git a/src/gui/imagerpanel.cc b/src/gui/imagerpanel.cc index d0305882..45aefa5b 100644 --- a/src/gui/imagerpanel.cc +++ b/src/gui/imagerpanel.cc @@ -8,7 +8,7 @@ #include "lib/encoders/encoders.h" #include "lib/decoders/decoders.h" #include "lib/config/proto.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "gui.h" #include "lib/data/layout.h" #include "fluxviewerwindow.h" diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc index 62ae14e0..6bf48813 100644 --- a/src/gui/mainwindow.cc +++ b/src/gui/mainwindow.cc @@ -3,7 +3,7 @@ #include "lib/config/proto.h" #include "gui.h" #include "lib/core/logger.h" -#include "lib/readerwriter.h" +#include "lib/algorithms/readerwriter.h" #include "lib/fluxsource/fluxsource.h" #include "lib/fluxsink/fluxsink.h" #include "lib/imagereader/imagereader.h" diff --git a/tests/build.py b/tests/build.py index 3cf1f533..f4d7d707 100644 --- a/tests/build.py +++ b/tests/build.py @@ -54,7 +54,6 @@ export( deps=[ "lib/external+fl2_proto_lib", "+fmt_lib", - "+lib", "+protobuf_lib", "+protocol", "+z_lib", @@ -84,7 +83,6 @@ export( deps=[ "lib/external+fl2_proto_lib", "+fmt_lib", - "+lib", "+protobuf_lib", "+protocol", "+z_lib", @@ -96,6 +94,7 @@ export( "dep/libusbp", "dep/snowhouse", "dep/stb", + "lib/algorithms", "lib/config", "lib/core", "lib/data", diff --git a/tools/build.py b/tools/build.py index a0f1c4c2..bdbd384f 100644 --- a/tools/build.py +++ b/tools/build.py @@ -10,13 +10,14 @@ cxxprogram( srcs=["./brother120tool.cc"], deps=[ "+fmt_lib", - "+lib", "+protobuf_lib", "+z_lib", "lib/config", "lib/core", "lib/data", "lib/fluxsource+proto_lib", + "lib/algorithms", + "src/formats", ] + emu, ) @@ -26,13 +27,14 @@ cxxprogram( srcs=["./brother240tool.cc"], deps=[ "+fmt_lib", - "+lib", "+protobuf_lib", "+z_lib", "lib/config", "lib/core", "lib/data", "lib/fluxsource+proto_lib", + "lib/algorithms", + "src/formats", ] + emu, ) @@ -42,7 +44,6 @@ cxxprogram( srcs=["./upgrade-flux-file.cc"], deps=[ "+fmt_lib", - "+lib", "+protobuf_lib", "+protocol", "+sqlite3_lib", @@ -53,6 +54,7 @@ cxxprogram( "lib/data", "lib/external+fl2_proto_lib", "lib/fluxsource+proto_lib", + "lib/algorithms", "src/formats", ], )