Skip to content

Commit 15a69f6

Browse files
davidgivendavidgiven
committed
Make build with the new ab --- but the tests fail.
1 parent 0f763fe commit 15a69f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+220
-148
lines changed

‎arch/aeslanier/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "aeslanier.h"
3+
#include "arch/aeslanier/aeslanier.h"
44
#include "lib/core/crc.h"
55
#include "lib/data/fluxmap.h"
66
#include "lib/data/fluxmapreader.h"

‎arch/agat/agat.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "agat.h"
3+
#include "arch/agat/agat.h"
44
#include "lib/core/bytes.h"
55
#include "fmt/format.h"
66

‎arch/agat/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "agat.h"
3+
#include "arch/agat/agat.h"
44
#include "lib/core/crc.h"
55
#include "lib/data/fluxmap.h"
66
#include "lib/data/fluxmapreader.h"

‎arch/agat/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "agat.h"
5+
#include "arch/agat/agat.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "lib/data/layout.h"

‎arch/amiga/amiga.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "amiga.h"
3+
#include "arch/amiga/amiga.h"
44
#include "lib/core/bytes.h"
55
#include "fmt/format.h"
66

‎arch/amiga/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "amiga.h"
8+
#include "arch/amiga/amiga.h"
99
#include "lib/core/bytes.h"
1010
#include "fmt/format.h"
1111
#include "lib/decoders/decoders.pb.h"

‎arch/amiga/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "amiga.h"
5+
#include "arch/amiga/amiga.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "arch/amiga/amiga.pb.h"

‎arch/apple2/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "apple2.h"
8+
#include "arch/apple2/apple2.h"
99
#include "arch/apple2/apple2.pb.h"
1010
#include "lib/decoders/decoders.pb.h"
1111
#include "lib/core/bytes.h"

‎arch/arch.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "arch/rolandd20/rolandd20.h"
1919
#include "arch/smaky6/smaky6.h"
2020
#include "arch/tartu/tartu.h"
21-
#include "arch/tids990/tids990.h"
21+
#include "arch/tids990/tids990"
2222
#include "arch/victor9k/victor9k.h"
2323
#include "arch/zilogmcz/zilogmcz.h"
2424
#include "arch/arch.h"

‎arch/brother/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "lib/data/fluxpattern.h"
55
#include "lib/decoders/decoders.h"
66
#include "lib/encoders/encoders.h"
7-
#include "brother.h"
7+
#include "arch/brother/brother.h"
88
#include "lib/data/sector.h"
99
#include "lib/core/bytes.h"
1010
#include "lib/core/crc.h"

‎arch/brother/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "brother.h"
5+
#include "arch/brother/brother.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "arch/brother/brother.pb.h"

‎arch/build.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"./apple2/encoder.cc",
4747
"./brother/decoder.cc",
4848
"./brother/encoder.cc",
49+
"./brother/header_gcr.h",
4950
"./c64/c64.cc",
5051
"./c64/decoder.cc",
5152
"./c64/encoder.cc",
@@ -55,6 +56,7 @@
5556
"./ibm/encoder.cc",
5657
"./macintosh/decoder.cc",
5758
"./macintosh/encoder.cc",
59+
"./macintosh/data_gcr.h",
5860
"./micropolis/decoder.cc",
5961
"./micropolis/encoder.cc",
6062
"./mx/decoder.cc",
@@ -76,7 +78,7 @@
7678
"arch/apple2/apple2.h": "./apple2/apple2.h",
7779
"arch/amiga/amiga.h": "./amiga/amiga.h",
7880
"arch/smaky6/smaky6.h": "./smaky6/smaky6.h",
79-
"arch/tids990/tids990.h": "./tids990/tids990.h",
81+
"arch/tids990/tids990": "./tids990/tids990.h",
8082
"arch/zilogmcz/zilogmcz.h": "./zilogmcz/zilogmcz.h",
8183
"arch/amiga/amiga.h": "./amiga/amiga.h",
8284
"arch/f85/data_gcr.h": "./f85/data_gcr.h",

‎arch/c64/c64.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "lib/core/globals.h"
2-
#include "c64.h"
2+
#include "arch/c64/c64.h"
33

44
/*
55
* Track Sectors/track # Sectors Storage in Bytes Clock rate

‎arch/c64/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "c64.h"
8+
#include "arch/c64/c64.h"
99
#include "lib/core/crc.h"
1010
#include "lib/core/bytes.h"
1111
#include "fmt/format.h"

‎arch/c64/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "c64.h"
5+
#include "arch/c64/c64.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/sector.h"
88
#include "lib/data/image.h"

‎arch/f85/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "f85.h"
8+
#include "arch/f85/f85.h"
99
#include "lib/core/crc.h"
1010
#include "lib/core/bytes.h"
1111
#include "fmt/format.h"

‎arch/fb100/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "fb100.h"
8+
#include "arch/fb100/fb100.h"
99
#include "lib/core/crc.h"
1010
#include "lib/core/bytes.h"
1111
#include "lib/decoders/rawbits.h"

‎arch/ibm/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "ibm.h"
3+
#include "arch/ibm/ibm.h"
44
#include "lib/core/crc.h"
55
#include "lib/data/fluxmap.h"
66
#include "lib/data/fluxmapreader.h"

‎arch/ibm/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/config/config.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "ibm.h"
5+
#include "arch/ibm/ibm.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "arch/ibm/ibm.pb.h"

‎arch/macintosh/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "macintosh.h"
8+
#include "arch/macintosh/macintosh.h"
99
#include "lib/core/bytes.h"
1010
#include "fmt/format.h"
1111
#include <string.h>

‎arch/macintosh/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "macintosh.h"
5+
#include "arch/macintosh/macintosh.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "fmt/format.h"

‎arch/micropolis/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "lib/data/fluxpattern.h"
55
#include "lib/decoders/decoders.h"
66
#include "lib/data/sector.h"
7-
#include "micropolis.h"
7+
#include "arch/micropolis/micropolis.h"
88
#include "lib/core/bytes.h"
99
#include "fmt/format.h"
1010
#include "lib/decoders/decoders.pb.h"

‎arch/micropolis/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "lib/core/globals.h"
2-
#include "micropolis.h"
2+
#include "arch/micropolis/micropolis.h"
33
#include "lib/data/sector.h"
44
#include "lib/decoders/decoders.h"
55
#include "lib/encoders/encoders.h"

‎arch/northstar/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "lib/data/fluxpattern.h"
1818
#include "lib/decoders/decoders.h"
1919
#include "lib/data/sector.h"
20-
#include "northstar.h"
20+
#include "arch/northstar/northstar.h"
2121
#include "lib/core/bytes.h"
2222
#include "lib/decoders/decoders.pb.h"
2323
#include "fmt/format.h"

‎arch/northstar/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "lib/core/globals.h"
2-
#include "northstar.h"
2+
#include "arch/northstar/northstar.h"
33
#include "lib/data/sector.h"
44
#include "lib/core/bytes.h"
55
#include "lib/decoders/decoders.h"

‎arch/rolandd20/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "lib/data/fluxpattern.h"
77
#include "lib/data/sector.h"
88
#include "lib/core/bytes.h"
9-
#include "rolandd20.h"
9+
#include "arch/rolandd20/rolandd20.h"
1010
#include <string.h>
1111

1212
/* Sector header record:

‎arch/smaky6/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "smaky6.h"
8+
#include "arch/smaky6/smaky6.h"
99
#include "lib/core/bytes.h"
1010
#include "lib/core/crc.h"
1111
#include "fmt/format.h"

‎arch/tids990/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
33
#include "lib/encoders/encoders.h"
4-
#include "arch/tids990/tids990.h"
4+
#include "arch/tids990/tids990"
55
#include "lib/core/crc.h"
66
#include "lib/data/fluxmap.h"
77
#include "lib/data/fluxmapreader.h"

‎arch/tids990/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
33
#include "lib/encoders/encoders.h"
4-
#include "tids990.h"
4+
#include "arch/tids990/tids990"
55
#include "lib/core/crc.h"
66
#include "lib/data/image.h"
77
#include "arch/tids990/tids990.pb.h"

‎arch/victor9k/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "victor9k.h"
8+
#include "arch/victor9k/victor9k.h"
99
#include "lib/core/crc.h"
1010
#include "lib/core/bytes.h"
1111
#include "fmt/format.h"

‎arch/victor9k/encoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "victor9k.h"
5+
#include "arch/victor9k/victor9k.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/sector.h"
88
#include "lib/data/image.h"

‎arch/zilogmcz/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "zilogmcz.h"
8+
#include "arch/zilogmcz/zilogmcz.h"
99
#include "lib/core/bytes.h"
1010
#include "lib/core/crc.h"
1111
#include "fmt/format.h"

‎build.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@
7979
ins=["src+fluxengine"],
8080
deps=["scripts/encodedecodetest.sh"],
8181
commands=[
82-
"{deps[0]} "
82+
"$[deps[0]] "
8383
+ c[0]
8484
+ " "
8585
+ format
86-
+ " {ins[0]} '"
86+
+ " $[ins[0]] '"
8787
+ c[1]
8888
+ "' '"
8989
+ c[2]
90-
+ "' $(dir {outs[0]}) > /dev/null"
90+
+ "' $(dir $[outs[0]]) > /dev/null"
9191
],
9292
label="CORPUSTEST",
9393
)

‎build/ab.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ ifeq ($(OS), Windows_NT)
5151
endif
5252
EXT ?=
5353

54+
CWD=$(shell pwd)
55+
5456
ifeq ($(PROGRESSINFO),)
5557
# The first make invocation here has to have its output discarded or else it
5658
# produces spurious 'Leaving directory' messages... don't know why.

0 commit comments

Comments
 (0)