# HG changeset patch # User Chris Cannam # Date 1530196292 -3600 # Node ID d2ee0bde170517efa7f5547ba8c9e501022c939b # Parent 4b772833fe1c119fb31d65c6da7bf1efeb85b571 Attempt to follow exclusion list and name package from revision diff -r 4b772833fe1c -r d2ee0bde1705 deploy/linux/bintray.json --- a/deploy/linux/bintray.json Thu Jun 28 13:11:46 2018 +0100 +++ b/deploy/linux/bintray.json Thu Jun 28 15:31:32 2018 +0100 @@ -18,7 +18,7 @@ "files": [ { - "includePattern": "\./(Sonic_Visualiser-x86_64.AppImage)", + "includePattern": "\./(SonicVisualiser-.*-x86_64\\.AppImage)", "uploadPattern": "$1", "matrixParams": { "override": 1 } } diff -r 4b772833fe1c -r d2ee0bde1705 deploy/linux/deploy-appimage.sh --- a/deploy/linux/deploy-appimage.sh Thu Jun 28 13:11:46 2018 +0100 +++ b/deploy/linux/deploy-appimage.sh Thu Jun 28 15:31:32 2018 +0100 @@ -6,6 +6,19 @@ checker=vamp-plugin-load-checker piper=piper-vamp-simple-server +get_id() { + if [ -d .hg ]; then + hg id | sed 's/[+ ].*$//' + elif [ -d .git ]; then + git rev-parse --short HEAD + else + echo "WARNING: can't figure out revision from VCS metadata" 1>&2 + echo "unknown" + fi +} + +version=$(get_id) + targetdir="${program}.AppDir" echo "Target dir is $targetdir" @@ -29,9 +42,15 @@ local binary="$1" for lib in $(ldd "$binary" | egrep '=> (/usr)?(/local)?/lib/' | \ - sed 's/^.*=> //' | sed 's/ .*$//' | \ - grep -v 'libc.so' | grep -v 'libm.so'); do + sed 's/^.*=> //' | sed 's/ .*$//'); do + base=$(basename "$lib") + if grep -v '^#' sv-dependency-builds/linux/appimage/excludelist | + grep -q "^$base$" ; then + echo "excluding: $lib" + continue + fi + mkdir -p "$targetdir/$(dirname $lib)" if [ ! -f "$targetdir/$lib" ]; then @@ -65,5 +84,5 @@ cp sv-dependency-builds/linux/appimage/AppRun-x86_64 "$targetdir/AppRun" chmod +x "$targetdir/AppRun" -ARCH=x86_64 sv-dependency-builds/linux/appimage/appimagetool-x86_64.AppImage "$targetdir" +ARCH=x86_64 sv-dependency-builds/linux/appimage/appimagetool-x86_64.AppImage "$targetdir" "SonicVisualiser-$version-x86_64.AppImage" diff -r 4b772833fe1c -r d2ee0bde1705 repoint-lock.json --- a/repoint-lock.json Thu Jun 28 13:11:46 2018 +0100 +++ b/repoint-lock.json Thu Jun 28 15:31:32 2018 +0100 @@ -7,7 +7,7 @@ "pin": "71202259002d" }, "svgui": { - "pin": "13e17e61f898" + "pin": "be935f9b2ae6" }, "svapp": { "pin": "d4c16eed673d" @@ -37,7 +37,7 @@ "pin": "d90244c003be" }, "sv-dependency-builds": { - "pin": "a9f5ce17330a" + "pin": "f1a9b270e043" }, "icons/scalable": { "pin": "1c6516ba7fc1"