Merge.

mkninja.sh

@@ -0,0 +1,219 @@
+#!/bin/sh
+set -e
+packages="zlib sqlite3 libusb-1.0"
+pkgcflags="$(pkg-config --cflags $packages) -Idep/fmt"
+pkgldflags=$(pkg-config --libs $packages)
+
+cat <<-EOF
+#############################################################################
+###                   THIS FILE IS AUTOGENERATED                          ###
+#############################################################################
+#
+# Don't edit it. Your changes will be destroyed. Instead, edit mkninja.sh
+# instead. The next time you run ninja, this file will be automatically
+# updated.
+
+rule mkninja
+    command = sh ./mkninja.sh > \$out.new && mv -f \$out.new \$out
+    generator = true
+build build.ninja : mkninja mkninja.sh
+
+CXX = g++
+AR = ar rcs
+CFLAGS = -Og -g --std=c++14
+LDFLAGS = -Og
+
+OBJDIR = .obj
+
+rule cxx
+    command = \$CXX \$CFLAGS \$flags -I. -c -o \$out \$in -MMD -MF \$out.d
+    description = CXX \$in
+    depfile = \$out.d
+    deps = gcc
+    
+rule library
+    command = \$AR \$out \$in
+    description = AR \$in
+
+rule link
+    command = \$CXX \$LDFLAGS -o \$out \$in \$flags
+    description = LINK \$in
+
+rule test
+    command = \$in && touch \$out
+    description = TEST \$in
+EOF
+
+buildlibrary() {
+    local lib
+    lib=$1
+    shift
+
+    local flags
+    flags=
+    while true; do
+        case $1 in
+            -*)
+                flags="$flags $1"
+                shift
+                ;;
+
+            *)
+                break
+        esac
+    done
+
+    local objs
+    objs=
+    for src in "$@"; do
+        local obj
+        obj="\$OBJDIR/${src%%.cc}.o"
+        objs="$objs $obj"
+
+        echo build $obj : cxx $src
+        echo "    flags=$flags"
+    done
+
+    echo build \$OBJDIR/$lib : library $objs
+}
+
+buildprogram() {
+    local prog
+    prog=$1
+    shift
+
+    local flags
+    flags=
+    while true; do
+        case $1 in
+            -*)
+                flags="$flags $1"
+                shift
+                ;;
+
+            *)
+                break
+        esac
+    done
+
+    local objs
+    objs=
+    for src in "$@"; do
+        objs="$objs \$OBJDIR/$src"
+    done
+
+    echo build $prog : link $objs
+    echo "    flags=$flags"
+}
+
+runtest() {
+    local prog
+    prog=$1
+    shift
+
+    buildlibrary lib$prog.a \
+        -Ilib \
+        $pkgcflags \
+        "$@"
+
+    buildprogram \$OBJDIR/$prog \
+        $pkgldflags \
+        lib$prog.a \
+        libbackend.a \
+        libfmt.a
+
+    echo build \$OBJDIR/$prog.stamp : test \$OBJDIR/$prog
+}
+
+buildlibrary libfmt.a \
+    dep/fmt/format.cc \
+    dep/fmt/posix.cc \
+
+buildlibrary libbackend.a \
+    -Ilib \
+    $pkgcflags \
+    lib/aeslanier/decoder.cc \
+    lib/amiga/decoder.cc \
+    lib/apple2/decoder.cc \
+    lib/brother/decoder.cc \
+    lib/brother/encoder.cc \
+    lib/bytes.cc \
+    lib/c64/decoder.cc \
+    lib/common/crunch.c \
+    lib/crc.cc \
+    lib/dataspec.cc \
+    lib/decoders/decoders.cc \
+    lib/decoders/fluxmapreader.cc \
+    lib/decoders/fmmfm.cc \
+    lib/encoder.cc \
+    lib/f85/decoder.cc \
+    lib/fb100/decoder.cc \
+    lib/flags.cc \
+    lib/fluxmap.cc \
+    lib/fluxsink/fluxsink.cc \
+    lib/fluxsink/hardwarefluxsink.cc \
+    lib/fluxsink/sqlitefluxsink.cc \
+    lib/fluxsource/fluxsource.cc \
+    lib/fluxsource/hardwarefluxsource.cc \
+    lib/fluxsource/kryoflux.cc \
+    lib/fluxsource/sqlitefluxsource.cc \
+    lib/fluxsource/streamfluxsource.cc \
+    lib/globals.cc \
+    lib/hexdump.cc \
+    lib/ibm/decoder.cc \
+    lib/image.cc \
+    lib/macintosh/decoder.cc \
+    lib/mx/decoder.cc \
+    lib/reader.cc \
+    lib/sector.cc \
+    lib/sectorset.cc \
+    lib/sql.cc \
+    lib/usb.cc \
+    lib/victor9k/decoder.cc \
+    lib/writer.cc \
+    lib/zilogmcz/decoder.cc \
+
+buildlibrary libfrontend.a \
+    -Ilib \
+    $pkgcflags \
+    src/fe-erase.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-readmx.cc \
+    src/fe-readvictor9k.cc \
+    src/fe-readzilogmcz.cc \
+    src/fe-rpm.cc \
+    src/fe-seek.cc \
+    src/fe-testbulktransport.cc \
+    src/fe-upgradefluxfile.cc \
+    src/fe-writebrother.cc \
+    src/fe-writeflux.cc \
+    src/fe-writetestpattern.cc \
+    src/fluxengine.cc \
+
+buildprogram fluxengine \
+    $pkgldflags \
+    libfrontend.a \
+    libbackend.a \
+    libfmt.a \
+
+runtest dataspec-test       tests/dataspec.cc
+runtest flags-test          tests/flags.cc
+runtest fmmfm-test          tests/fmmfm.cc
+runtest bitaccumulator-test tests/bitaccumulator.cc
+runtest kryoflux-test       tests/kryoflux.cc
+runtest compression-test    tests/compression.cc
+runtest bytes-test          tests/bytes.cc
+runtest crunch-test         tests/crunch.cc
+runtest fluxpattern-test    tests/fluxpattern.cc