# HG changeset patch
# User Chris Cannam
# Date 1383652712 0
# Node ID 51bf4d43a1c0e7a48b74e6c41fe99f9c90151469
# Parent  e3a4831f9c64f2983ee63a1f6b4dfba082c6b786# Parent  7adcad79d5484709682f6f04138a35812ef08ece
Merge from default branch

diff -r e3a4831f9c64 -r 51bf4d43a1c0 .hgsub
--- a/.hgsub	Tue Nov 05 11:17:35 2013 +0000
+++ b/.hgsub	Tue Nov 05 11:58:32 2013 +0000
@@ -2,3 +2,4 @@
 svgui = https://code.soundsoftware.ac.uk/hg/svgui
 svapp = https://code.soundsoftware.ac.uk/hg/svapp
 dataquay = https://bitbucket.org/breakfastquay/dataquay
+sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds
diff -r e3a4831f9c64 -r 51bf4d43a1c0 .hgsubstate
--- a/.hgsubstate	Tue Nov 05 11:17:35 2013 +0000
+++ b/.hgsubstate	Tue Nov 05 11:58:32 2013 +0000
@@ -1,4 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
+3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
 3fc0df28953377c96e501f41db6fb80d29d6aa4a svapp
 e50a8fee67529803a1512d1ddd83eb6a76d853c4 svcore
 26c5f7fd4807211cc18b3e8e68b67f43e962203c svgui
diff -r e3a4831f9c64 -r 51bf4d43a1c0 deploy/src/archive.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/src/archive.sh	Tue Nov 05 11:58:32 2013 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+tag=`hg tags | grep '^sv_v' | head -1 | awk '{ print $1; }'`
+
+v=`echo "$tag" |sed 's/sv_v//'`
+
+echo "Packaging up version $v from tag $tag..."
+
+hg archive -r"$tag" --subrepos --exclude sv-dependency-builds /tmp/sonic-visualiser-"$v".tar.gz
+
diff -r e3a4831f9c64 -r 51bf4d43a1c0 misc/superconfigure
--- a/misc/superconfigure	Tue Nov 05 11:17:35 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-subdirs="svcore svgui svapp sonic-visualiser"
-echo 
-echo " *** Preparing to configure in: $subdirs"
-echo
-for dir in $subdirs; do
-    echo " *** Configuring in: $dir"
-    echo
-    ( cd "$dir" && ./configure "$@" ) || exit 1
-    echo
-done
-cat > Makefile <<EOF
-TARGETS = sub-svcore sub-svgui sub-svapp sub-sonic-visualiser
-all:	\$(TARGETS)
-sub-svcore:
-	\$(MAKE) --directory=svcore
-sub-svgui:
-	\$(MAKE) --directory=svgui
-sub-svapp:
-	\$(MAKE) --directory=svapp
-sub-sonic-visualiser:
-	\$(MAKE) --directory=sonic-visualiser
-EOF
-echo " *** Generated Makefile"