From 315c1d5a4704ecbc3b24fce1c30d04fc2d252c07 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 21 Mar 2011 19:12:54 +0000 Subject: more automated build stuff git-svn-id: svn://localhost/ardour2/branches/3.0@9178 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/noderun | 7 +++---- wscript | 17 ++++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/linux_packaging/noderun b/tools/linux_packaging/noderun index 22140c7224..99eeb04d01 100644 --- a/tools/linux_packaging/noderun +++ b/tools/linux_packaging/noderun @@ -8,13 +8,12 @@ fi cd $BASE || exit 1 svn update || exit 1 -./waf configure --strict || exit 1 +./waf configure --strict --noconfirm || exit 1 ./waf || exit 1 cd tools/linux_packaging || exit 1 ./build --public || exit 1 file=`ls -t *.bz2 | head -1` +echo "Copying $file to shared zone" #cp $file $BASE/../vmshare || exit 1 -exit 0 - - +exit 0 diff --git a/wscript b/wscript index 29deb27c4c..c1b196909c 100644 --- a/wscript +++ b/wscript @@ -390,6 +390,8 @@ def set_options(opt): help='directory where Boost header files can be found') opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows', help='directory where Wine\'s Windows header files can be found') + opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', + help='Do not ask questions that require confirmation during the build') for i in children: opt.sub_options(i) @@ -398,13 +400,14 @@ def sub_config_and_use(conf, name, has_objects = True): autowaf.set_local_lib(conf, name, has_objects) def configure(conf): - print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' + - 'You are respectfully requested NOT to ask for assistance with build issues\n' + - 'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' + - 'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' + - 'Thanks for your co-operation with our development process.\n\n' + - 'Press Enter to continue.\n') - sys.stdin.readline() + if not Options.options.noconfirm: + print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' + + 'You are respectfully requested NOT to ask for assistance with build issues\n' + + 'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' + + 'Please use IRC, the bug tracker and/or the ardour mailing lists (-dev or -user)\n\n' + + 'Thanks for your co-operation with our development process.\n\n' + + 'Press Enter to continue.\n') + sys.stdin.readline() create_stored_revision() conf.env['VERSION'] = VERSION conf.line_just = 52 -- cgit v1.2.3