13
0

more automated build stuff

git-svn-id: svn://localhost/ardour2/branches/3.0@9178 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-21 19:12:54 +00:00
parent 272b790943
commit 315c1d5a47
2 changed files with 13 additions and 11 deletions

View File

@ -8,13 +8,12 @@ fi
cd $BASE || exit 1 cd $BASE || exit 1
svn update || exit 1 svn update || exit 1
./waf configure --strict || exit 1 ./waf configure --strict --noconfirm || exit 1
./waf || exit 1 ./waf || exit 1
cd tools/linux_packaging || exit 1 cd tools/linux_packaging || exit 1
./build --public || exit 1 ./build --public || exit 1
file=`ls -t *.bz2 | head -1` file=`ls -t *.bz2 | head -1`
echo "Copying $file to shared zone"
#cp $file $BASE/../vmshare || exit 1 #cp $file $BASE/../vmshare || exit 1
exit 0 exit 0

View File

@ -390,6 +390,8 @@ def set_options(opt):
help='directory where Boost header files can be found') 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', 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') 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: for i in children:
opt.sub_options(i) opt.sub_options(i)
@ -398,6 +400,7 @@ def sub_config_and_use(conf, name, has_objects = True):
autowaf.set_local_lib(conf, name, has_objects) autowaf.set_local_lib(conf, name, has_objects)
def configure(conf): def configure(conf):
if not Options.options.noconfirm:
print ('\n\nThis is an alpha version of Ardour 3.0.\n\n' + 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' + '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' + 'and not to report issues with Ardour 3.0 on the forums at ardour.org.\n\n' +