Merge branch 'windows+cc' into cairocanvas

[ardour.git] / tools / linux_packaging / run

diff --git a/tools/linux_packaging/run b/tools/linux_packaging/run
index 2f3b1587c820e9b6306be5407cce9cea4e730555..23bd0149dfbf81aae19f9343e5ec09cda32dec4e 100644 (file)
--- a/tools/linux_packaging/run
+++ b/tools/linux_packaging/run
@@ -1,17 +1,24 @@
 #!/bin/sh
 
 vbm=VBoxManage
-basedir=/home/harrison/ardour/3.0/tools/linux_packaging
+basedir=/home/harrison/ardour/3.0
 tooldir=$basedir/tools/linux_packaging
 u=harrison
 p=harrison
 
-for VM in Build_64bit_804s ; do
+for VM in Build_32bit_804s Build_64bit_804s ; do
     $vbm startvm $VM --type headless
-    echo "Waiting for guest control to be available (12 seconds) ... "
+    echo "$VM: Waiting for guest control to be available (12 seconds) ... "
     sleep 12
-    echo "Running $tooldir/noderun $basedir on $VM ... "
-    $vbm guestcontrol exec $VM /bin/sh --arguments $tooldir/noderun --arguments $basedir --username $u --password $p --wait-for stdout
+    echo "$VM: Running $tooldir/noderun $basedir on $VM ... "
+    $vbm guestcontrol exec $VM /bin/sh \
+             --arguments $tooldir/noderun \
+             --environment PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+             --username $u --password $p --wait-for stdout
     status=$?
     $vbm controlvm $VM savestate
+    if [ $status -ne 0 ] ; then
+        echo "Build failed while in VM $VM"
+        break
+    fi
 done