diff options
| author | Robin Gareus <robin@gareus.org> | 2013-06-14 18:12:55 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-06-14 18:12:55 +0200 |
| commit | 377a016d59f36719c5e8341146413d5a5d37db1b (patch) | |
| tree | 9e4b61ff0c488f9d0e1dc2f85890dc1fbc435e31 /tools/osx_packaging | |
| parent | 12584b7a7a90aa4ae48c59b72b9b251e151e079c (diff) | |
packaging scripts: use rsync for video-tools
Diffstat (limited to 'tools/osx_packaging')
| -rwxr-xr-x | tools/osx_packaging/osx_build | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 18d3b311ed..4880107806 100755 --- 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 ] |