# HG changeset patch
# User Chris Cannam
# Date 1571758348 -3600
# Node ID 5d2d3fdae35448e54c0fc7f16dd3a078ca49c5b9
# Parent  32107caa1aaa753ca8a83eacad24ba5dee31421d# Parent  779a7066285918bbdb0ddc7f8889b17e9ee9bf83
Merge

diff -r 32107caa1aaa -r 5d2d3fdae354 .hgignore
--- a/.hgignore	Tue Oct 22 16:32:14 2019 +0100
+++ b/.hgignore	Tue Oct 22 16:32:28 2019 +0100
@@ -59,3 +59,5 @@
 *.AppDir
 Dockerfile*.gen
 squashfs-root
+.notarization-uuid
+.notarization-status
diff -r 32107caa1aaa -r 5d2d3fdae354 deploy/clean-build-and-package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/clean-build-and-package	Tue Oct 22 16:32:28 2019 +0100
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+set -eu
+
+current=$(hg id | awk '{ print $1; }')
+
+#case "$current" in
+#    *+) echo "ERROR: Current working copy has been modified - not proceeding"; exit 2;;
+#    *);;
+#esac
+
+version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h`
+
+mkdir -p packages
+echo
+
+if [ -d /Applications ]; then
+
+    qmake=$(grep '^# Command: ' Makefile | awk '{ print $3; }')
+
+    echo "Proceed to rebuild, package, and sign version $version using"
+    echo -n "qmake path \"$qmake\" [Yn] ? "
+    read yn
+    case "$yn" in "") ;; [Yy]) ;; *) exit 3;; esac
+    echo "Proceeding"
+
+    app="Sonic Visualiser"
+    volume="$app"-"$version"
+    dmg="$volume".dmg
+
+    rm -rf "$app.app"
+    rm -f "$dmg"
+
+    ./repoint install
+
+    rm -rf .qmake.stash
+    "$qmake" -r
+    make clean
+    make -j3
+    deploy/osx/deploy-and-package.sh
+
+    mv "$dmg" packages/
+
+else
+
+    echo -n "Proceed to rebuild and package version $version [Yn] ? "
+    read yn
+    case "$yn" in "") ;; [Yy]) ;; *) exit 3;; esac
+    echo "Proceeding"
+
+    ./deploy/linux/build-and-test-appimage.sh
+
+    squashedversion=$(echo "$version" | sed 's/_-//g')
+
+    mv deploy/linux/docker/output/SonicVisualiser-"$current"-x86_64.AppImage \
+	packages/SonicVisualiser-"$squashedversion"-x86_64.AppImage
+
+    ./deploy/linux/build-and-test-deb.sh
+
+    mv deploy/linux/docker/output/sonic-visualiser_"$version"_amd64.deb \
+	packages/
+fi
+
+echo "Done"
+
diff -r 32107caa1aaa -r 5d2d3fdae354 deploy/osx/build-and-package.sh
--- a/deploy/osx/build-and-package.sh	Tue Oct 22 16:32:14 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# This script is very specific to certain Xcode and Qt versions -
-# review before running, or do a standard build and a deployment with
-# deploy-and-package.sh instead
-
-set -eu
-
-app="Sonic Visualiser"
-
-version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h`
-
-volume="$app"-"$version"
-dmg="$volume".dmg
-compatdmg="$volume-osx-10.7.dmg"
-
-./repoint install
-
-echo
-echo "Rebuilding for current macOS..."
-echo
-
-rm -rf .qmake.stash
-$HOME/Qt/5.13.1/clang_64/bin/qmake -r
-make clean
-make -j3
-deploy/osx/deploy-and-package.sh
-
-echo
-echo "Done, images are in $dmg and $compatdmg"
-echo
-
diff -r 32107caa1aaa -r 5d2d3fdae354 deploy/osx/notarize.sh
--- a/deploy/osx/notarize.sh	Tue Oct 22 16:32:14 2019 +0100
+++ b/deploy/osx/notarize.sh	Tue Oct 22 16:32:28 2019 +0100
@@ -28,7 +28,8 @@
 echo "Uploading for notarization..."
 
 uuidfile=.notarization-uuid
-rm -f "$uuidfile"
+statfile=.notarization-status
+rm -f "$uuidfile" "$statfile"
 
 xcrun altool --notarize-app \
     -f "$dmg" \
@@ -51,21 +52,26 @@
 
 while true ; do
     sleep 30
-    status=$(xcrun altool --notarization-info "$uuid" -u "$user" -p @keychain:altool 2>&1)
-    if echo "$status" | grep -q 'Package Approved' ; then
+
+    xcrun altool --notarization-info \
+	"$uuid" \
+	-u "$user" \
+	-p @keychain:altool 2>&1 | tee "$statfile"
+
+    if grep -q 'Package Approved' "$statfile"; then
 	echo
 	echo "Approved! Status output is:"
-	echo "$status"
+	cat "$statfile"
 	break
-    elif echo "$status" | grep -q 'in progress' ; then
+    elif grep -q 'in progress' "$statfile" ; then
 	echo
 	echo "Still in progress... Status output is:"
-	echo "$status"
+	cat "$statfile"
 	echo "Waiting..."
     else 
 	echo
 	echo "Failure or unknown status in output:"
-	echo "$status"
+	cat "$statfile"
 	exit 2
     fi
 done
diff -r 32107caa1aaa -r 5d2d3fdae354 deploy/src/archive.sh
--- a/deploy/src/archive.sh	Tue Oct 22 16:32:14 2019 +0100
+++ b/deploy/src/archive.sh	Tue Oct 22 16:32:28 2019 +0100
@@ -16,9 +16,11 @@
 echo
 echo -n "Packaging up version $v from tag $tag... "
 
+mkdir -p packages
+
 hg update -r"$tag"
 
-./repoint archive /tmp/sonic-visualiser-"$v".tar.gz --exclude sv-dependency-builds repoint.pri
+./repoint archive ./packages/sonic-visualiser-"$v".tar.gz --exclude sv-dependency-builds repoint.pri
 
 hg update -r"$current"
 
diff -r 32107caa1aaa -r 5d2d3fdae354 repoint-lock.json
--- a/repoint-lock.json	Tue Oct 22 16:32:14 2019 +0100
+++ b/repoint-lock.json	Tue Oct 22 16:32:28 2019 +0100
@@ -1,7 +1,7 @@
 {
   "libraries": {
     "vamp-plugin-sdk": {
-      "pin": "0b6802e3b755"
+      "pin": "569fc23fa37a"
     },
     "svcore": {
       "pin": "871a2050236b"
diff -r 32107caa1aaa -r 5d2d3fdae354 version.h
--- a/version.h	Tue Oct 22 16:32:14 2019 +0100
+++ b/version.h	Tue Oct 22 16:32:28 2019 +0100
@@ -1,1 +1,1 @@
-#define SV_VERSION "4.0-pre3"
+#define SV_VERSION "4.0-pre4"