DisOrder 2.0

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index e3a1a0a85165865406616b30e3d57402fac18725..eae90c60e49ed976020a07dae5e0252994ec70bf 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -20,7 +20,7 @@
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
              disorder-speaker disorder-decode disorder-normalize \
-             disorder-stats
+             disorder-stats disorder-dbupgrade
 noinst_PROGRAMS=disorder.cgi trackname
 noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
@@ -88,6 +88,11 @@ disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC) $(LIBGCRYPT)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
+disorder_dbupgrade_SOURCES=dbupgrade.c trackdb.c trackdb.h ../lib/memgc.c
+disorder_dbupgrade_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_dbupgrade_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_cgi_SOURCES=dcgi.c dcgi.h                     \
        api.c api-client.c api-client.h                 \
        cgi.c cgi.h cgimain.c exports.c
@@ -103,22 +108,51 @@ trackname_DEPENDENCIES=../lib/libdisorder.a
 install-exec-hook:
        $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
-check: check-help
+check: check-help check-decode
 
-# check everything has working --help
+# check everything has working --help and --version
 check-help: all
        ./disorderd --help > /dev/null
+       ./disorderd --version > /dev/null
        ./disorder-dump --help > /dev/null
+       ./disorder-dump --version > /dev/null
        ./disorder-deadlock --help > /dev/null
+       ./disorder-deadlock --version > /dev/null
        ./trackname --help > /dev/null
+       ./trackname --version > /dev/null
        ./disorder-speaker --help > /dev/null
+       ./disorder-speaker --version > /dev/null
+       ./disorder-decode --help > /dev/null
+       ./disorder-decode --version > /dev/null
+       ./disorder-normalize --help > /dev/null
+       ./disorder-normalize --version > /dev/null
+       ./disorder-stats --help > /dev/null
+       ./disorder-stats --version > /dev/null
+       ./disorder-dbupgrade --help > /dev/null
+       ./disorder-dbupgrade --version > /dev/null
+       ./disorder-rescan --help > /dev/null
+       ./disorder-rescan --version > /dev/null
+
+# My sox doesn't know MP3 or FLAC unfortunately
+check-decode: disorder-decode disorder-normalize
+       echo "speaker_backend network" > config
+       echo "broadcast 127.255.255.255 discard" > config
+       ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
+         ./disorder-normalize --config config > decoded.raw
+       oggdec -b 16 -e 1 -R -s 1 -o oggdec.raw ${top_srcdir}/sounds/scratch.ogg
+       cmp decoded.raw oggdec.raw
+       sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
+       ./disorder-decode scratch.wav | \
+         ./disorder-normalize --config config > decoded.raw
+       cmp decoded.raw oggdec.raw
+       rm -f scratch.wav config decoded.raw oggdec.raw
 
 cgi.o: ../lib/definitions.h
 
 # for Mac OS X >=10.4
 SEDFILES=uk.org.greenend.rjk.disorder.plist
 include ${top_srcdir}/scripts/sedfiles.make
-EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in
+EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in README.dbversions
 LAUNCHD=/Library/LaunchDaemons
 
 #install-data-hook: