salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Finally eliminate the +lib target.

Browse Source
This commit is contained in:
David Given
2024-10-19 13:18:28 +02:00
parent 3c67a67ae7
commit ed604f6284
19 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build.py
View File

@@ -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")

21
lib/algorithms/build.py Normal file
View File

@@ -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",
],
)

2
lib/readerwriter.cc → lib/algorithms/readerwriter.cc
View File

@@ -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"

0
lib/readerwriter.h → lib/algorithms/readerwriter.h
View File

5
lib/vfs/build.py
View File

@@ -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",
],
)

2
lib/vfs/fluxsectorinterface.cc
View File

@@ -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"

2
src/build.py
View File

@@ -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",
],

2
src/fe-putfile.cc
View File

@@ -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"

2
src/fe-rawread.cc
View File

@@ -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"

2
src/fe-rawwrite.cc
View File

@@ -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"

2
src/fe-read.cc
View File

@@ -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"

2
src/fe-write.cc
View File

@@ -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"

2
src/fileutils.cc
View File

@@ -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"

1
src/gui/build.py
View File

@@ -63,7 +63,6 @@ cxxprogram(
"dep/hfsutils",
"dep/libusbp",
"extras+icons",
"+lib",
"lib/core",
"lib/data",
"lib/vfs",

2
src/gui/drivetypes/build.py
View File

@@ -32,5 +32,5 @@ protoencode(
cxxlibrary(
name="drivetypes",
srcs=[".+drivetypes_cc", ".+drivetypes_table_cc"],
deps=["+lib"],
deps=["lib/core", "lib/config"],
)

2
src/gui/imagerpanel.cc
View File

@@ -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"

2
src/gui/mainwindow.cc
View File

@@ -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"

3
tests/build.py
View File

@@ -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",

8
tools/build.py
View File

@@ -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",
],
)