Patch from drmoore to fix mantis 2807 (crash on creating new return)

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 648402894990e7937077c8b3435d646c258bb27c..ffe7aa89ec3012eb3a240ef6adba97d90918ac9c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -5,6 +5,7 @@ import os
 import commands
 import re
 import string
+import subprocess
 
 # Variables for 'waf dist'
 VERSION = '3.0pre0'
@@ -29,6 +30,11 @@ children = [
 ]
 
 
+i18n_children = [
+       'gtk2_ardour',
+       'libs/ardour'
+]
+
 # Version stuff
 
 def fetch_svn_revision (path):
@@ -48,12 +54,23 @@ def fetch_git_revision (path):
                        pass
        return rev
 
+def fetch_bzr_revision (path):
+       cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True)
+       out = cmd.communicate()[0]
+       svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE)
+       str = svn.group(0)
+       chars = 'svnreio: '
+       return string.lstrip(str, chars)
+
 def create_stored_revision():
        rev = ""
        if os.path.exists('.svn'):
                rev = fetch_svn_revision('.');
        elif os.path.exists('.git'):
                rev = fetch_git_revision('.');
+       elif os.path.exists('.bzr'):
+               rev = fetch_bzr_revision('.');
+               print "Revision: " + rev;
        elif os.path.exists('libs/ardour/svn_revision.cc'):
                print "Using packaged svn revision"
                return
@@ -201,7 +218,7 @@ def set_compiler_flags (conf,opt):
            
        if conf.env['build_target'] == 'x86_64' and opt.vst:
                print "\n\n=================================================="
-               print "You cannot use VST plugins with a 64 bit host. Please run scons with VST=0"
+               print "You cannot use VST plugins with a 64 bit host. Please run waf with --vst=0"
                print "\nIt is theoretically possible to build a 32 bit host on a 64 bit system."
                print "However, this is tricky and not recommended for beginners."
                sys.exit (-1)
@@ -255,6 +272,7 @@ def set_compiler_flags (conf,opt):
                conf.env.append_value('LINKFLAGS', debug_flags)
        else:
                conf.env.append_value('CCFLAGS', optimization_flags)
+               conf.env.append_value('CXXFLAGS', optimization_flags)
                conf.env.append_value('LINKFLAGS', optimization_flags)
 
        if opt.stl_debug:
@@ -283,7 +301,7 @@ def set_compiler_flags (conf,opt):
        #
 
        conf.env.append_value('CCFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ])
-       conf.env.append_value('CXXFLAGS', [ '-D_LARGEFILE_SOURCE', '-D_LARGEFILE_SOURCE' ])
+       conf.env.append_value('CXXFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ])
        if opt.nls:
                conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
                conf.env.append_value('CCFLAGS', '-DENABLE_NLS')
@@ -385,6 +403,8 @@ def configure(conf):
        autowaf.display_msg(conf, 'Samplerate', bool(conf.env['HAVE_SAMPLERATE']))
        autowaf.display_msg(conf, 'Soundtouch', bool(conf.env['HAVE_SOUNDTOUCH']))
        autowaf.display_msg(conf, 'Translation', opts.nls)
+       if opts.nls:
+               conf.define ('ENABLE_NLS', 1)
        autowaf.display_msg(conf, 'System Libraries', opts.syslibs)
        autowaf.display_msg(conf, 'Tranzport', opts.tranzport)
        if opts.tranzport:
@@ -410,6 +430,6 @@ def build(bld):
        for i in children:
                bld.add_subdirs(i)
 
-def shutdown():
-       autowaf.shutdown()
+def i18n(bld):
+       bld.recurse (i18n_children)