mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Merge branch 'master' into micropolis-write
Let's not act like this actually compiles.
This commit is contained in:
Eric Anderson
424
mkninja.sh
424
mkninja.sh
@@ -8,8 +8,23 @@ rule cxx
|
||||
depfile = \$out.d
|
||||
deps = gcc
|
||||
|
||||
rule proto
|
||||
command = (echo \$in > \$def) && $PROTOC \$flags \$in
|
||||
description = PROTO \$in
|
||||
restat = yes
|
||||
|
||||
rule protoencode
|
||||
command = (echo '#include <string>' && echo 'static const unsigned char data[] = {' && $PROTOC \$flags --encode=\$messagetype \$\$(cat \$def)< \$in > \$out.bin && $XXD -i < \$out.bin && echo '}; extern std::string \$name(); std::string \$name() { return std::string((const char*)data, sizeof(data)); }') > \$out
|
||||
description = PROTOENCODE \$in
|
||||
restat = yes
|
||||
|
||||
rule binencode
|
||||
command = xxd -i \$in > \$out
|
||||
description = XXD \$in
|
||||
restat = true
|
||||
|
||||
rule library
|
||||
command = $AR \$out \$in
|
||||
command = $AR \$out \$in && $RANLIB \$out
|
||||
description = AR \$in
|
||||
|
||||
rule link
|
||||
@@ -20,9 +35,18 @@ rule test
|
||||
command = \$in && touch \$out
|
||||
description = TEST \$in
|
||||
|
||||
rule encodedecode
|
||||
command = sh scripts/encodedecodetest.sh \$format \$configs > \$out
|
||||
description = ENCODEDECODE \$format
|
||||
|
||||
rule strip
|
||||
command = cp -f \$in \$out && $STRIP \$out
|
||||
description = STRIP \$in
|
||||
|
||||
rule mktable
|
||||
command = sh scripts/mktable.sh \$kind \$words > \$out
|
||||
description = MKTABLE \$kind
|
||||
restat = true
|
||||
EOF
|
||||
|
||||
buildlibrary() {
|
||||
@@ -30,6 +54,59 @@ buildlibrary() {
|
||||
lib=$1
|
||||
shift
|
||||
|
||||
local flags
|
||||
flags=
|
||||
local deps
|
||||
deps=
|
||||
while true; do
|
||||
case $1 in
|
||||
-d)
|
||||
deps="$deps $2"
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
|
||||
-*)
|
||||
flags="$flags $1"
|
||||
shift
|
||||
;;
|
||||
|
||||
*)
|
||||
break
|
||||
esac
|
||||
done
|
||||
|
||||
local oobjs
|
||||
local dobjs
|
||||
oobjs=
|
||||
dobjs=
|
||||
for src in "$@"; do
|
||||
local obj
|
||||
obj="$OBJDIR/opt/${src%%.c*}.o"
|
||||
oobjs="$oobjs $obj"
|
||||
|
||||
echo "build $obj : cxx $src | $deps"
|
||||
echo " flags=$flags $COPTFLAGS"
|
||||
|
||||
obj="$OBJDIR/dbg/${src%%.c*}.o"
|
||||
dobjs="$dobjs $obj"
|
||||
|
||||
echo "build $obj : cxx $src | $deps"
|
||||
echo " flags=$flags $CDBGFLAGS"
|
||||
done
|
||||
|
||||
echo build $OBJDIR/opt/$lib : library $oobjs
|
||||
echo build $OBJDIR/dbg/$lib : library $dobjs
|
||||
}
|
||||
|
||||
buildproto() {
|
||||
local lib
|
||||
lib=$1
|
||||
shift
|
||||
|
||||
local def
|
||||
def=$OBJDIR/proto/${lib%%.a}.def
|
||||
|
||||
local flags
|
||||
flags=
|
||||
while true; do
|
||||
@@ -44,27 +121,42 @@ buildlibrary() {
|
||||
esac
|
||||
done
|
||||
|
||||
local oobjs
|
||||
local dobjs
|
||||
oobjs=
|
||||
dobjs=
|
||||
local cfiles
|
||||
local hfiles
|
||||
cfiles=
|
||||
hfiles=
|
||||
for src in "$@"; do
|
||||
local obj
|
||||
obj="$OBJDIR/opt/${src%%.c*}.o"
|
||||
oobjs="$oobjs $obj"
|
||||
|
||||
echo build $obj : cxx $src
|
||||
echo " flags=$flags $COPTFLAGS"
|
||||
|
||||
obj="$OBJDIR/dbg/${src%%.c*}.o"
|
||||
dobjs="$dobjs $obj"
|
||||
|
||||
echo build $obj : cxx $src
|
||||
echo " flags=$flags $CDBGFLAGS"
|
||||
local cfile
|
||||
local hfile
|
||||
cfile="$OBJDIR/proto/${src%%.proto}.pb.cc"
|
||||
hfile="$OBJDIR/proto/${src%%.proto}.pb.h"
|
||||
cfiles="$cfiles $cfile"
|
||||
hfiles="$hfiles $hfile"
|
||||
done
|
||||
|
||||
echo build $OBJDIR/opt/$lib : library $oobjs
|
||||
echo build $OBJDIR/dbg/$lib : library $dobjs
|
||||
echo build $cfiles $hfiles $def : proto $@
|
||||
echo " flags=$flags --cpp_out=$OBJDIR/proto"
|
||||
echo " def=$def"
|
||||
|
||||
buildlibrary $lib -I$OBJDIR/proto $cfiles
|
||||
}
|
||||
|
||||
buildencodedproto() {
|
||||
local def
|
||||
local message
|
||||
local name
|
||||
local input
|
||||
local output
|
||||
def=$1
|
||||
message=$2
|
||||
name=$3
|
||||
input=$4
|
||||
output=$5
|
||||
|
||||
echo "build $output : protoencode $input | $def"
|
||||
echo " name=$name"
|
||||
echo " def=$def"
|
||||
echo " messagetype=$message"
|
||||
}
|
||||
|
||||
buildprogram() {
|
||||
@@ -87,9 +179,9 @@ buildprogram() {
|
||||
done
|
||||
|
||||
local oobjs
|
||||
local dobjs
|
||||
local dobjs
|
||||
oobjs=
|
||||
dobjs=
|
||||
dobjs=
|
||||
for src in "$@"; do
|
||||
oobjs="$oobjs $OBJDIR/opt/$src"
|
||||
dobjs="$dobjs $OBJDIR/dbg/$src"
|
||||
@@ -98,15 +190,16 @@ buildprogram() {
|
||||
echo build $prog-debug$EXTENSION : link $dobjs
|
||||
echo " flags=$flags $LDDBGFLAGS"
|
||||
|
||||
echo build $prog$EXTENSION : link $oobjs
|
||||
echo build $prog$EXTENSION-unstripped : link $oobjs
|
||||
echo " flags=$flags $LDOPTFLAGS"
|
||||
|
||||
echo build $prog$EXTENSION : strip $prog$EXTENSION-unstripped
|
||||
}
|
||||
|
||||
buildsimpleprogram() {
|
||||
local prog
|
||||
prog=$1
|
||||
shift
|
||||
local prog
|
||||
prog=$1
|
||||
shift
|
||||
|
||||
local flags
|
||||
flags=
|
||||
@@ -122,12 +215,25 @@ buildsimpleprogram() {
|
||||
esac
|
||||
done
|
||||
|
||||
local src
|
||||
src=$1
|
||||
shift
|
||||
local src
|
||||
src=$1
|
||||
shift
|
||||
|
||||
buildlibrary lib$prog.a $flags $src
|
||||
buildprogram $prog lib$prog.a "$@"
|
||||
buildlibrary lib$prog.a $flags $src
|
||||
buildprogram $prog lib$prog.a "$@"
|
||||
}
|
||||
|
||||
buildmktable() {
|
||||
local kind
|
||||
local out
|
||||
kind=$1
|
||||
out=$2
|
||||
shift
|
||||
shift
|
||||
|
||||
echo "build $out : mktable scripts/mktable.sh"
|
||||
echo " words=$@"
|
||||
echo " kind=$kind"
|
||||
}
|
||||
|
||||
runtest() {
|
||||
@@ -136,38 +242,84 @@ runtest() {
|
||||
shift
|
||||
|
||||
buildlibrary lib$prog.a \
|
||||
-Idep/snowhouse/include \
|
||||
-d $OBJDIR/proto/libconfig.def \
|
||||
-d $OBJDIR/proto/libdata.def \
|
||||
"$@"
|
||||
|
||||
buildprogram $OBJDIR/$prog \
|
||||
lib$prog.a \
|
||||
libbackend.a \
|
||||
libconfig.a \
|
||||
libdata.a \
|
||||
libtestproto.a \
|
||||
libagg.a \
|
||||
libfmt.a
|
||||
|
||||
echo build $OBJDIR/$prog.stamp : test $OBJDIR/$prog-debug$EXTENSION
|
||||
}
|
||||
|
||||
encodedecodetest() {
|
||||
local format
|
||||
format=$1
|
||||
shift
|
||||
|
||||
echo "build $OBJDIR/$format.encodedecode.stamp : encodedecode | fluxengine$EXTENSION scripts/encodedecodetest.sh $*"
|
||||
echo " format=$format"
|
||||
echo " configs=$*"
|
||||
}
|
||||
|
||||
buildlibrary libagg.a \
|
||||
-Idep/agg/include \
|
||||
dep/stb/stb_image_write.c \
|
||||
dep/agg/src/*.cpp
|
||||
|
||||
buildlibrary libfmt.a \
|
||||
dep/fmt/format.cc \
|
||||
dep/fmt/posix.cc \
|
||||
dep/fmt/os.cc \
|
||||
|
||||
buildproto libconfig.a \
|
||||
arch/aeslanier/aeslanier.proto \
|
||||
arch/amiga/amiga.proto \
|
||||
arch/apple2/apple2.proto \
|
||||
arch/brother/brother.proto \
|
||||
arch/c64/c64.proto \
|
||||
arch/f85/f85.proto \
|
||||
arch/fb100/fb100.proto \
|
||||
arch/ibm/ibm.proto \
|
||||
arch/macintosh/macintosh.proto \
|
||||
arch/micropolis/micropolis.proto \
|
||||
arch/mx/mx.proto \
|
||||
arch/northstar/northstar.proto \
|
||||
arch/tids990/tids990.proto \
|
||||
arch/victor9k/victor9k.proto \
|
||||
arch/zilogmcz/zilogmcz.proto \
|
||||
lib/common.proto \
|
||||
lib/config.proto \
|
||||
lib/decoders/decoders.proto \
|
||||
lib/encoders/encoders.proto \
|
||||
lib/fluxsource/fluxsource.proto \
|
||||
lib/fluxsink/fluxsink.proto \
|
||||
lib/imagereader/imagereader.proto \
|
||||
lib/imagewriter/imagewriter.proto \
|
||||
lib/usb/usb.proto \
|
||||
|
||||
buildproto libdata.a \
|
||||
lib/data.proto
|
||||
|
||||
buildlibrary libbackend.a \
|
||||
lib/imagereader/diskcopyimagereader.cc \
|
||||
lib/imagereader/imagereader.cc \
|
||||
lib/imagereader/imgimagereader.cc \
|
||||
lib/imagereader/jv3imagereader.cc \
|
||||
lib/imagewriter/d64imagewriter.cc \
|
||||
lib/imagewriter/diskcopyimagewriter.cc \
|
||||
lib/imagewriter/imagewriter.cc \
|
||||
lib/imagewriter/imgimagewriter.cc \
|
||||
lib/imagewriter/ldbsimagewriter.cc \
|
||||
-I$OBJDIR/proto \
|
||||
-d $OBJDIR/proto/libconfig.def \
|
||||
-d $OBJDIR/proto/libdata.def \
|
||||
arch/aeslanier/decoder.cc \
|
||||
arch/amiga/amiga.cc \
|
||||
arch/amiga/decoder.cc \
|
||||
arch/amiga/encoder.cc \
|
||||
arch/amiga/amiga.cc \
|
||||
arch/apple2/decoder.cc \
|
||||
arch/brother/decoder.cc \
|
||||
arch/brother/encoder.cc \
|
||||
arch/c64/decoder.cc \
|
||||
arch/c64/encoder.cc \
|
||||
arch/f85/decoder.cc \
|
||||
arch/fb100/decoder.cc \
|
||||
arch/ibm/decoder.cc \
|
||||
@@ -177,112 +329,206 @@ buildlibrary libbackend.a \
|
||||
arch/micropolis/decoder.cc \
|
||||
arch/micropolis/encoder.cc \
|
||||
arch/mx/decoder.cc \
|
||||
arch/tids990/decoder.cc \
|
||||
arch/tids990/encoder.cc \
|
||||
arch/northstar/decoder.cc \
|
||||
arch/northstar/encoder.cc \
|
||||
arch/tids990/decoder.cc \
|
||||
arch/tids990/encoder.cc \
|
||||
arch/victor9k/decoder.cc \
|
||||
arch/zilogmcz/decoder.cc \
|
||||
lib/bitmap.cc \
|
||||
lib/bytes.cc \
|
||||
lib/crc.cc \
|
||||
lib/dataspec.cc \
|
||||
lib/csvreader.cc \
|
||||
lib/decoders/decoders.cc \
|
||||
lib/decoders/fluxmapreader.cc \
|
||||
lib/decoders/fmmfm.cc \
|
||||
lib/encoders/encoders.cc \
|
||||
lib/flags.cc \
|
||||
lib/fluxmap.cc \
|
||||
lib/fluxsink/aufluxsink.cc \
|
||||
lib/fluxsink/fluxsink.cc \
|
||||
lib/fluxsink/hardwarefluxsink.cc \
|
||||
lib/fluxsink/scpfluxsink.cc \
|
||||
lib/fluxsink/sqlitefluxsink.cc \
|
||||
lib/fluxsink/vcdfluxsink.cc \
|
||||
lib/fluxsource/cwffluxsource.cc \
|
||||
lib/fluxsource/erasefluxsource.cc \
|
||||
lib/fluxsource/fluxsource.cc \
|
||||
lib/fluxsource/hardwarefluxsource.cc \
|
||||
lib/fluxsource/kryoflux.cc \
|
||||
lib/fluxsource/kryofluxfluxsource.cc \
|
||||
lib/fluxsource/scpfluxsource.cc \
|
||||
lib/fluxsource/sqlitefluxsource.cc \
|
||||
lib/fluxsource/streamfluxsource.cc \
|
||||
lib/usb/usb.cc \
|
||||
lib/fluxsource/testpatternfluxsource.cc \
|
||||
lib/globals.cc \
|
||||
lib/hexdump.cc \
|
||||
lib/image.cc \
|
||||
lib/imagereader/d64imagereader.cc \
|
||||
lib/imagereader/diskcopyimagereader.cc \
|
||||
lib/imagereader/imagereader.cc \
|
||||
lib/imagereader/imdimagereader.cc \
|
||||
lib/imagereader/imgimagereader.cc \
|
||||
lib/imagereader/jv3imagereader.cc \
|
||||
lib/imagereader/nsiimagereader.cc \
|
||||
lib/imagewriter/d64imagewriter.cc \
|
||||
lib/imagewriter/diskcopyimagewriter.cc \
|
||||
lib/imagewriter/imagewriter.cc \
|
||||
lib/imagewriter/imgimagewriter.cc \
|
||||
lib/imagewriter/ldbsimagewriter.cc \
|
||||
lib/imagewriter/nsiimagewriter.cc \
|
||||
lib/ldbs.cc \
|
||||
lib/proto.cc \
|
||||
lib/reader.cc \
|
||||
lib/sector.cc \
|
||||
lib/sql.cc \
|
||||
lib/usb/fluxengineusb.cc \
|
||||
lib/usb/greaseweazle.cc \
|
||||
lib/usb/greaseweazleusb.cc \
|
||||
lib/globals.cc \
|
||||
lib/hexdump.cc \
|
||||
lib/ldbs.cc \
|
||||
lib/reader.cc \
|
||||
lib/sector.cc \
|
||||
lib/sectorset.cc \
|
||||
lib/sql.cc \
|
||||
lib/visualiser.cc \
|
||||
lib/usb/usb.cc \
|
||||
lib/usb/usbfinder.cc \
|
||||
lib/utils.cc \
|
||||
lib/writer.cc \
|
||||
|
||||
FORMATS="\
|
||||
acornadfs \
|
||||
acorndfs \
|
||||
aeslanier \
|
||||
amiga \
|
||||
ampro \
|
||||
apple2 \
|
||||
atarist360 \
|
||||
atarist370 \
|
||||
atarist400 \
|
||||
atarist410 \
|
||||
atarist720 \
|
||||
atarist740 \
|
||||
atarist800 \
|
||||
atarist820 \
|
||||
brother120 \
|
||||
brother240 \
|
||||
commodore1541 \
|
||||
commodore1581 \
|
||||
eco1 \
|
||||
f85 \
|
||||
fb100 \
|
||||
hplif770 \
|
||||
ibm \
|
||||
ibm1200_525 \
|
||||
ibm1440 \
|
||||
ibm180_525 \
|
||||
ibm360_525 \
|
||||
ibm720 \
|
||||
ibm720_525 \
|
||||
mac400 \
|
||||
mac800 \
|
||||
micropolis \
|
||||
mx \
|
||||
northstar175 \
|
||||
northstar350 \
|
||||
northstar87 \
|
||||
tids990 \
|
||||
victor9k \
|
||||
zilogmcz \
|
||||
"
|
||||
|
||||
for pb in $FORMATS; do
|
||||
buildencodedproto $OBJDIR/proto/libconfig.def ConfigProto \
|
||||
formats_${pb}_pb src/formats/$pb.textpb $OBJDIR/proto/src/formats/$pb.cc
|
||||
done
|
||||
|
||||
buildmktable formats $OBJDIR/formats.cc $FORMATS
|
||||
|
||||
buildlibrary libfrontend.a \
|
||||
src/fe-cwftoflux.cc \
|
||||
src/fe-erase.cc \
|
||||
src/fe-fluxtoau.cc \
|
||||
src/fe-fluxtoscp.cc \
|
||||
src/fe-fluxtovcd.cc \
|
||||
src/fe-image.cc \
|
||||
-I$OBJDIR/proto \
|
||||
-d $OBJDIR/proto/libconfig.def \
|
||||
-d $OBJDIR/proto/libdata.def \
|
||||
$(for a in $FORMATS; do echo $OBJDIR/proto/src/formats/$a.cc; done) \
|
||||
$OBJDIR/formats.cc \
|
||||
src/fe-analysedriveresponse.cc \
|
||||
src/fe-analyselayout.cc \
|
||||
src/fe-inspect.cc \
|
||||
src/fe-readadfs.cc \
|
||||
src/fe-readaeslanier.cc \
|
||||
src/fe-readamiga.cc \
|
||||
src/fe-readampro.cc \
|
||||
src/fe-readapple2.cc \
|
||||
src/fe-readbrother.cc \
|
||||
src/fe-readc64.cc \
|
||||
src/fe-readdfs.cc \
|
||||
src/fe-readf85.cc \
|
||||
src/fe-readfb100.cc \
|
||||
src/fe-readibm.cc \
|
||||
src/fe-readmac.cc \
|
||||
src/fe-readmicropolis.cc \
|
||||
src/fe-readmx.cc \
|
||||
src/fe-readtids990.cc \
|
||||
src/fe-readvictor9k.cc \
|
||||
src/fe-readzilogmcz.cc \
|
||||
src/fe-rawread.cc \
|
||||
src/fe-rawwrite.cc \
|
||||
src/fe-read.cc \
|
||||
src/fe-rpm.cc \
|
||||
src/fe-scptoflux.cc \
|
||||
src/fe-seek.cc \
|
||||
src/fe-testbandwidth.cc \
|
||||
src/fe-testvoltages.cc \
|
||||
src/fe-upgradefluxfile.cc \
|
||||
src/fe-writeamiga.cc \
|
||||
src/fe-writebrother.cc \
|
||||
src/fe-writeibm.cc \
|
||||
src/fe-writemac.cc \
|
||||
src/fe-writemicropolis.cc \
|
||||
src/fe-writetids990.cc \
|
||||
src/fe-writeflux.cc \
|
||||
src/fe-writetestpattern.cc \
|
||||
src/fe-write.cc \
|
||||
src/fluxengine.cc \
|
||||
|
||||
buildprogram fluxengine \
|
||||
libfrontend.a \
|
||||
libbackend.a \
|
||||
libconfig.a \
|
||||
libdata.a \
|
||||
libfmt.a \
|
||||
libagg.a \
|
||||
|
||||
buildlibrary libemu.a \
|
||||
dep/emu/fnmatch.c
|
||||
|
||||
buildsimpleprogram brother120tool \
|
||||
-Idep/emu \
|
||||
-Idep/emu \
|
||||
tools/brother120tool.cc \
|
||||
libbackend.a \
|
||||
libemu.a \
|
||||
libfmt.a \
|
||||
|
||||
buildsimpleprogram brother240tool \
|
||||
-Idep/emu \
|
||||
-Idep/emu \
|
||||
tools/brother240tool.cc \
|
||||
libbackend.a \
|
||||
libemu.a \
|
||||
libfmt.a \
|
||||
|
||||
buildproto libtestproto.a \
|
||||
tests/testproto.proto \
|
||||
|
||||
buildencodedproto $OBJDIR/proto/libtestproto.def TestProto testproto_pb tests/testproto.textpb $OBJDIR/proto/tests/testproto.cc
|
||||
|
||||
runtest agg-test tests/agg.cc
|
||||
runtest amiga-test tests/amiga.cc
|
||||
runtest bitaccumulator-test tests/bitaccumulator.cc
|
||||
runtest bytes-test tests/bytes.cc
|
||||
runtest compression-test tests/compression.cc
|
||||
runtest dataspec-test tests/dataspec.cc
|
||||
runtest csvreader-test tests/csvreader.cc
|
||||
runtest flags-test tests/flags.cc
|
||||
runtest fluxpattern-test tests/fluxpattern.cc
|
||||
runtest fmmfm-test tests/fmmfm.cc
|
||||
runtest greaseweazle-test tests/greaseweazle.cc
|
||||
runtest kryoflux-test tests/kryoflux.cc
|
||||
runtest ldbs-test tests/ldbs.cc
|
||||
runtest proto-test -I$OBJDIR/proto \
|
||||
-d $OBJDIR/proto/libconfig.def \
|
||||
-d $OBJDIR/proto/libdata.def \
|
||||
-d $OBJDIR/proto/libtestproto.def \
|
||||
tests/proto.cc \
|
||||
$OBJDIR/proto/tests/testproto.cc
|
||||
|
||||
encodedecodetest amiga
|
||||
encodedecodetest atarist360
|
||||
encodedecodetest atarist370
|
||||
encodedecodetest atarist400
|
||||
encodedecodetest atarist410
|
||||
encodedecodetest atarist720
|
||||
encodedecodetest atarist740
|
||||
encodedecodetest atarist800
|
||||
encodedecodetest atarist820
|
||||
encodedecodetest brother120
|
||||
encodedecodetest brother240
|
||||
encodedecodetest ibm1200_525
|
||||
encodedecodetest ibm1440
|
||||
encodedecodetest ibm180_525
|
||||
encodedecodetest ibm360_525
|
||||
encodedecodetest ibm720
|
||||
encodedecodetest ibm720_525
|
||||
encodedecodetest tids990
|
||||
encodedecodetest commodore1581
|
||||
encodedecodetest commodore1541 scripts/commodore1541_test.textpb
|
||||
encodedecodetest mac400 scripts/mac400_test.textpb
|
||||
encodedecodetest mac800 scripts/mac800_test.textpb
|
||||
|
||||
# vim: sw=4 ts=4 et
|
||||
|
||||
|
||||
Reference in New Issue
Block a user