Skip to content

Commit 4c140b1

Browse files
davidgivendavidgiven
committed
Modularise arch.
1 parent 4bcbf2b commit 4c140b1

File tree

7 files changed

+81
-67
lines changed

7 files changed

+81
-67
lines changed

‎arch/build.py

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,75 @@
2828
)
2929

3030
protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"])
31+
32+
cxxlibrary(
33+
name="arch",
34+
srcs=[
35+
"./arch.cc",
36+
"./aeslanier/decoder.cc",
37+
"./agat/agat.cc",
38+
"./agat/decoder.cc",
39+
"./agat/encoder.cc",
40+
"./amiga/amiga.cc",
41+
"./amiga/decoder.cc",
42+
"./amiga/encoder.cc",
43+
"./apple2/decoder.cc",
44+
"./apple2/encoder.cc",
45+
"./brother/decoder.cc",
46+
"./brother/encoder.cc",
47+
"./c64/c64.cc",
48+
"./c64/decoder.cc",
49+
"./c64/encoder.cc",
50+
"./f85/decoder.cc",
51+
"./fb100/decoder.cc",
52+
"./ibm/decoder.cc",
53+
"./ibm/encoder.cc",
54+
"./macintosh/decoder.cc",
55+
"./macintosh/encoder.cc",
56+
"./micropolis/decoder.cc",
57+
"./micropolis/encoder.cc",
58+
"./mx/decoder.cc",
59+
"./northstar/decoder.cc",
60+
"./northstar/encoder.cc",
61+
"./rolandd20/decoder.cc",
62+
"./smaky6/decoder.cc",
63+
"./tartu/decoder.cc",
64+
"./tartu/encoder.cc",
65+
"./tids990/decoder.cc",
66+
"./tids990/encoder.cc",
67+
"./victor9k/decoder.cc",
68+
"./victor9k/encoder.cc",
69+
"./zilogmcz/decoder.cc",
70+
],
71+
hdrs={
72+
"arch/ibm/ibm.h": "./ibm/ibm.h",
73+
"arch/apple2/data_gcr.h": "./apple2/data_gcr.h",
74+
"arch/apple2/apple2.h": "./apple2/apple2.h",
75+
"arch/amiga/amiga.h": "./amiga/amiga.h",
76+
"arch/smaky6/smaky6.h": "./smaky6/smaky6.h",
77+
"arch/tids990/tids990.h": "./tids990/tids990.h",
78+
"arch/zilogmcz/zilogmcz.h": "./zilogmcz/zilogmcz.h",
79+
"arch/amiga/amiga.h": "./amiga/amiga.h",
80+
"arch/f85/data_gcr.h": "./f85/data_gcr.h",
81+
"arch/f85/f85.h": "./f85/f85.h",
82+
"arch/mx/mx.h": "./mx/mx.h",
83+
"arch/aeslanier/aeslanier.h": "./aeslanier/aeslanier.h",
84+
"arch/northstar/northstar.h": "./northstar/northstar.h",
85+
"arch/brother/data_gcr.h": "./brother/data_gcr.h",
86+
"arch/brother/brother.h": "./brother/brother.h",
87+
"arch/brother/header_gcr.h": "./brother/header_gcr.h",
88+
"arch/macintosh/data_gcr.h": "./macintosh/data_gcr.h",
89+
"arch/macintosh/macintosh.h": "./macintosh/macintosh.h",
90+
"arch/agat/agat.h": "./agat/agat.h",
91+
"arch/fb100/fb100.h": "./fb100/fb100.h",
92+
"arch/victor9k/data_gcr.h": "./victor9k/data_gcr.h",
93+
"arch/victor9k/victor9k.h": "./victor9k/victor9k.h",
94+
"arch/rolandd20/rolandd20.h": "./rolandd20/rolandd20.h",
95+
"arch/micropolis/micropolis.h": "./micropolis/micropolis.h",
96+
"arch/c64/data_gcr.h": "./c64/data_gcr.h",
97+
"arch/c64/c64.h": "./c64/c64.h",
98+
"arch/tartu/tartu.h": "./tartu/tartu.h",
99+
"arch/arch.h": "./arch.h",
100+
},
101+
deps=["+lib"],
102+
)

‎build.py

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -27,70 +27,8 @@
2727
"./lib/decoders/fmmfm.cc",
2828
"./lib/encoders/encoders.cc",
2929
"./lib/readerwriter.cc",
30-
"./arch/arch.cc",
31-
"./arch/aeslanier/decoder.cc",
32-
"./arch/agat/agat.cc",
33-
"./arch/agat/decoder.cc",
34-
"./arch/agat/encoder.cc",
35-
"./arch/amiga/amiga.cc",
36-
"./arch/amiga/decoder.cc",
37-
"./arch/amiga/encoder.cc",
38-
"./arch/apple2/decoder.cc",
39-
"./arch/apple2/encoder.cc",
40-
"./arch/brother/decoder.cc",
41-
"./arch/brother/encoder.cc",
42-
"./arch/c64/c64.cc",
43-
"./arch/c64/decoder.cc",
44-
"./arch/c64/encoder.cc",
45-
"./arch/f85/decoder.cc",
46-
"./arch/fb100/decoder.cc",
47-
"./arch/ibm/decoder.cc",
48-
"./arch/ibm/encoder.cc",
49-
"./arch/macintosh/decoder.cc",
50-
"./arch/macintosh/encoder.cc",
51-
"./arch/micropolis/decoder.cc",
52-
"./arch/micropolis/encoder.cc",
53-
"./arch/mx/decoder.cc",
54-
"./arch/northstar/decoder.cc",
55-
"./arch/northstar/encoder.cc",
56-
"./arch/rolandd20/decoder.cc",
57-
"./arch/smaky6/decoder.cc",
58-
"./arch/tartu/decoder.cc",
59-
"./arch/tartu/encoder.cc",
60-
"./arch/tids990/decoder.cc",
61-
"./arch/tids990/encoder.cc",
62-
"./arch/victor9k/decoder.cc",
63-
"./arch/victor9k/encoder.cc",
64-
"./arch/zilogmcz/decoder.cc",
6530
],
6631
hdrs={
67-
"arch/ibm/ibm.h": "./arch/ibm/ibm.h",
68-
"arch/apple2/data_gcr.h": "./arch/apple2/data_gcr.h",
69-
"arch/apple2/apple2.h": "./arch/apple2/apple2.h",
70-
"arch/smaky6/smaky6.h": "./arch/smaky6/smaky6.h",
71-
"arch/tids990/tids990.h": "./arch/tids990/tids990.h",
72-
"arch/zilogmcz/zilogmcz.h": "./arch/zilogmcz/zilogmcz.h",
73-
"arch/amiga/amiga.h": "./arch/amiga/amiga.h",
74-
"arch/f85/data_gcr.h": "./arch/f85/data_gcr.h",
75-
"arch/f85/f85.h": "./arch/f85/f85.h",
76-
"arch/mx/mx.h": "./arch/mx/mx.h",
77-
"arch/aeslanier/aeslanier.h": "./arch/aeslanier/aeslanier.h",
78-
"arch/northstar/northstar.h": "./arch/northstar/northstar.h",
79-
"arch/brother/data_gcr.h": "./arch/brother/data_gcr.h",
80-
"arch/brother/brother.h": "./arch/brother/brother.h",
81-
"arch/brother/header_gcr.h": "./arch/brother/header_gcr.h",
82-
"arch/macintosh/data_gcr.h": "./arch/macintosh/data_gcr.h",
83-
"arch/macintosh/macintosh.h": "./arch/macintosh/macintosh.h",
84-
"arch/agat/agat.h": "./arch/agat/agat.h",
85-
"arch/fb100/fb100.h": "./arch/fb100/fb100.h",
86-
"arch/victor9k/data_gcr.h": "./arch/victor9k/data_gcr.h",
87-
"arch/victor9k/victor9k.h": "./arch/victor9k/victor9k.h",
88-
"arch/rolandd20/rolandd20.h": "./arch/rolandd20/rolandd20.h",
89-
"arch/micropolis/micropolis.h": "./arch/micropolis/micropolis.h",
90-
"arch/c64/data_gcr.h": "./arch/c64/data_gcr.h",
91-
"arch/c64/c64.h": "./arch/c64/c64.h",
92-
"arch/tartu/tartu.h": "./arch/tartu/tartu.h",
93-
"arch/arch.h": "./arch/arch.h",
9432
"lib/decoders/decoders.h": "./lib/decoders/decoders.h",
9533
"lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
9634
"lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",

‎build/c.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Toolchain:
2727
label = ""
2828
cfile = ["$(CC) -c -o {outs[0]} {ins[0]} $(CFLAGS) {cflags}"]
2929
cxxfile = ["$(CXX) -c -o {outs[0]} {ins[0]} $(CFLAGS) {cflags}"]
30-
clibrary = ["$(AR) cqs {outs[0]} {ins}"]
31-
cxxlibrary = ["$(AR) cqs {outs[0]} {ins}"]
30+
clibrary = ["rm -f {outs[0]} && $(AR) cqs {outs[0]} {ins}"]
31+
cxxlibrary = ["rm -f {outs[0]} && $(AR) cqs {outs[0]} {ins}"]
3232
cprogram = [
3333
"$(CC) -o {outs[0]} $(STARTGROUP) {ins} {ldflags} $(LDFLAGS) $(ENDGROUP)"
3434
]
@@ -41,8 +41,8 @@ class HostToolchain:
4141
label = "HOST "
4242
cfile = ["$(HOSTCC) -c -o {outs[0]} {ins[0]} $(HOSTCFLAGS) {cflags}"]
4343
cxxfile = ["$(HOSTCXX) -c -o {outs[0]} {ins[0]} $(HOSTCFLAGS) {cflags}"]
44-
clibrary = ["$(HOSTAR) cqs {outs[0]} {ins}"]
45-
cxxlibrary = ["$(HOSTAR) cqs {outs[0]} {ins}"]
44+
clibrary = ["rm -f {outs[0]} && $(HOSTAR) cqs {outs[0]} {ins}"]
45+
cxxlibrary = ["rm -f {outs[0]} && $(HOSTAR) cqs {outs[0]} {ins}"]
4646
cprogram = [
4747
"$(HOSTCC) -o {outs[0]} $(HOSTSTARTGROUP) {ins} {ldflags} $(HOSTLDFLAGS) $(HOSTENDGROUP)"
4848
]

‎lib/vfs/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
deps=[
4949
"+lib",
5050
"+fmt_lib",
51+
"arch",
5152
".+proto_lib",
5253
],
5354
)

‎src/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"lib/data",
4747
"lib/external",
4848
"lib/vfs",
49+
"arch",
4950
"src/formats",
5051
],
5152
)

‎src/gui/build.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"lib/data",
6969
"lib/vfs",
7070
"lib/config",
71+
"arch",
7172
"src/formats",
7273
"src/gui/drivetypes",
7374
"+z_lib",

‎tests/build.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
"src/formats",
104104
]
105105
+ ([".+test_proto_lib"] if n == "options" else [])
106-
+ (["lib/vfs"] if n in {"cpmfs", "applesingle", "vfs"} else []),
106+
+ (["lib/vfs"] if n in {"cpmfs", "applesingle", "vfs"} else [])
107+
+ (["arch"] if n in {"amiga"} else []),
107108
),
108109
)
109110
for n in tests

0 commit comments

Comments
 (0)