packaging scripts: use rsync for video-tools

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 2742ca9e379ea8db19935be9cae77c94a5db260d..72e60257f028af414d4b4ee189b90112ad0d45a0 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -14,6 +14,11 @@ ARDOURSTACK_ROOT=$HOME/a3/inst
 # the waf build tree to use when copying built/generated files
 BUILD_ROOT=../../build
 
+# where harvid and xjadeo binaries are cached
+if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then
+       CACHEDIR=`pwd`
+fi
+
 MIXBUS=
 WITH_LADSPA=0
 WITH_HARVID=
@@ -24,6 +29,7 @@ EXTERNAL_JACK=
 VENDOR=Ardour ;
 BUILDTYPE=""
 
+
 if [ $# -eq 0 ] ; then
        echo ""  
        echo "ERROR - Please specify build type"
@@ -529,12 +535,24 @@ done
 
 if test x$WITH_HARVID != x ; then
        cd $APPBIN
-       HARVID_VERSION=$(curl http://ardour.org/files/video-tools/harvid_version.txt)
-       curl -L http://ardour.org/files/video-tools/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \
-               | tar -x -z --exclude=README --exclude=harvid.1 --strip-components=1 || exit 1
-       XJADEO_VERSION=$(curl http://ardour.org/files/video-tools/xjadeo_version.txt)
-       curl -L http://ardour.org/files/video-tools/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz \
-               | tar -x -z --exclude=README --exclude=xjadeo.1 --strip-components=1 || exit 1
+       HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
+       XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
+
+       rsync -Pa \
+               rsync://ardour.org/video-tools/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \
+               "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz"
+
+       rsync -Pa \
+               rsync://ardour.org/video-tools/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz \
+               "$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz"
+
+       tar -x -z \
+               --exclude=README --exclude=harvid.1 --strip-components=1 \
+               -f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1
+
+       tar -x -z \
+               --exclude=README --exclude=xjadeo.1 --strip-components=1 \
+               -f "$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz" || exit 1
        mv xjadeo xjremote
        cd -
 fi

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 18d3b311eda3d25eeb1459df018eaf8bf5abedeb..4880107806a483b9eaa626e59db40bff6cbe9455 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -6,6 +6,11 @@ GTKSTACK_ROOT=$HOME/gtk/inst
 ARDOURSTACK_ROOT=$HOME/a3/inst
 BUILD_ROOT=../../build
 
+# where harvid and xjadeo binaries are cached
+if test -z "$CACHEDIR" -o ! -d "$CACHEDIR"; then
+       CACHEDIR=`pwd`
+fi
+
 SAE=
 MIXBUS=
 WITH_HARVID=
@@ -506,19 +511,25 @@ fi
 
 if test x$WITH_HARVID != x ; then
        echo "installing video tools.."
-       # TODO move files to http://ardour.org/files/ - symlink 'latest'
-       HARVID_VERSION=$(curl http://ardour.org/files/video-tools/harvid_version.txt)
-       XJADEO_VERSION=$(curl http://ardour.org/files/video-tools/xjadeo_version.txt)
+       HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
+       XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
        echo "copying harvid and xjadeo ..."
-  curl -L -o "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg" "http://sourceforge.net/projects/xjadeo/files/xjadeo/${XJADEO_VERSION}/jadeo-${XJADEO_VERSION:1}.dmg/download"
-  curl -L "http://ardour.org/files/video-tools/harvid-osx-${HARVID_VERSION}.tgz"\
-               | tar -x -z -C $PRODUCT_PKG_DIR/$APPROOT
 
-       ls -l "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg"
-       JADEO=$(hdiutil attach "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
+       rsync -Pa \
+               rsync://ardour.org/video-tools/harvid-osx-${HARVID_VERSION}.tgz \
+               "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz"
+
+       rsync -Pa \
+               rsync://ardour.org/video-tools/jadeo-${XJADEO_VERSION:1}.dmg \
+               "$CACHEDIR/jadeo-${XJADEO_VERSION:1}.dmg"
+
+       tar -x -z \
+               -C $PRODUCT_PKG_DIR/$APPROOT \
+               -f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1
+
+       JADEO=$(hdiutil attach "$CACHEDIR/jadeo-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
        cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
        hdiutil detach "${JADEO}"
-       rm "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg"
 
        DMGWINBOTTOM=580
        YPOS=$[ $DMGWINBOTTOM - 300 ]