Merge branch 'windows+cc' into cairocanvas

[ardour.git] / tools / linux_packaging / noderun

diff --git a/tools/linux_packaging/noderun b/tools/linux_packaging/noderun
index 0d1a6ea881405fd87c8dffb05e7e7ddd76d54a32..a6357ef48837f1d5ec66855a57eed0491fab9577 100644 (file)
--- a/tools/linux_packaging/noderun
+++ b/tools/linux_packaging/noderun
@@ -1,25 +1,23 @@
 #!/bin/sh
 
-BASE=$1
-
-if [ x$BASE = "x" ] ; then 
-   exit 1
-fi
+BASE=$(readlink -f $0)
+BASE=$(dirname $BASE) # up one
+BASE=$(dirname $BASE) # up one more
+BASE=$(dirname $BASE) # up again
 
 if mount | grep --silent vmshare ; then
-    :
-else
-    sudo mount -t vboxsf vmshare ~/vmshare
+    sudo mount -t vboxsf vmshare $HOME/vmshare
 fi
 
 cd $BASE || exit 1
-svn update || exit 1
-./waf configure --strict --noconfirm || exit 1
+git pull || exit 1
+./waf configure $* --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1
 ./waf || exit 1
 cd tools/linux_packaging || exit 1
-./build --public --nostrip || exit 1
-file=`ls -t *.bz2 | head -1`
-echo "Copying $file to ardour.org ..."
-scp $file ardour@ardour.org:ardour.org/files || exit 1
+./build --public --harvid --strip some || exit 1
+./package --public --singlearch || exit 1
+file=`ls -t *.tar`
+echo "Copying $file to shared folder ..."
+sudo cp $file $HOME/vmshare || exit 1
 
 exit 0