diff options
-rw-r--r-- | tools/linux_packaging/noderun | 2 | ||||
-rw-r--r-- | tools/linux_packaging/run | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/tools/linux_packaging/noderun b/tools/linux_packaging/noderun index 6aeeaa583a..99eeb04d01 100644 --- a/tools/linux_packaging/noderun +++ b/tools/linux_packaging/noderun @@ -6,8 +6,6 @@ if [ x$BASE = "x" ] ; then exit 1 fi -echo "Hello, world!" - cd $BASE || exit 1 svn update || exit 1 ./waf configure --strict --noconfirm || exit 1 diff --git a/tools/linux_packaging/run b/tools/linux_packaging/run index 2f3b1587c8..c6951e5031 100644 --- a/tools/linux_packaging/run +++ b/tools/linux_packaging/run @@ -1,17 +1,26 @@ #!/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 ; 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 -vx \ + --arguments $tooldir/noderun \ + --arguments $basedir \ + --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 |