Remove non-working attempt to make time selection changes undo-able. Cleanup use...

[ardour.git] / autowaf.py

diff --git a/autowaf.py b/autowaf.py
index f157526c4bdfdb02a28f1014ae71eac0db2654a7..e59c134a4383f5ca8ff6053583ed6df968d46cf2 100644 (file)
--- a/autowaf.py
+++ b/autowaf.py
@@ -81,18 +81,8 @@ def check_header(conf, name, define='', mandatory=False):
                else:
                        conf.check(header_name=name, mandatory=mandatory)
 
-def check_tool(conf, name):
-       "Check for a tool iff it hasn't been checked for yet"
-       if type(conf.env['AUTOWAF_TOOLS']) != dict:
-               conf.env['AUTOWAF_TOOLS'] = {}
-
-       checked = conf.env['AUTOWAF_TOOLS']
-       if not name in checked:
-               conf.check_tool(name)
-               checked[name] = True
-
 def nameify(name):
-       return name.replace('/', '_').replace('++', 'PP').replace('-', '_')
+       return name.replace('/', '_').replace('++', 'PP').replace('-', '_').replace('.', '_')
 
 def check_pkg(conf, name, **args):
        if not 'mandatory' in args:
@@ -133,66 +123,67 @@ def configure(conf):
                conf.env.append_value('CCFLAGS', vals.split())
                conf.env.append_value('CXXFLAGS', vals.split())
        conf.line_just = 43
-       check_tool(conf, 'misc')
-       check_tool(conf, 'compiler_cc')
-       check_tool(conf, 'compiler_cxx')
+       conf.check_tool('misc')
+       conf.check_tool('compiler_cc')
+       conf.check_tool('compiler_cxx')
        conf.env['BUILD_DOCS'] = Options.options.build_docs
        conf.env['DEBUG'] = Options.options.debug
        conf.env['STRICT'] = Options.options.strict
        conf.env['PREFIX'] = os.path.abspath(os.path.expanduser(os.path.normpath(conf.env['PREFIX'])))
+
        if Options.options.bundle:
                conf.env['BUNDLE'] = True
                conf.define('BUNDLE', 1)
                conf.env['BINDIR'] = conf.env['PREFIX']
-               conf.env['INCLUDEDIR'] = conf.env['PREFIX'] + '/Headers/'
-               conf.env['LIBDIR'] = conf.env['PREFIX'] + '/Libraries/'
-               conf.env['DATADIR'] = conf.env['PREFIX'] + '/Resources/'
-               conf.env['HTMLDIR'] = conf.env['PREFIX'] + '/Resources/Documentation/'
-               conf.env['MANDIR'] = conf.env['PREFIX'] + '/Resources/Man/'
-               conf.env['LV2DIR'] = conf.env['PREFIX'] + '/PlugIns/'
+               conf.env['INCLUDEDIR'] = os.path.join(conf.env['PREFIX'], 'Headers')
+               conf.env['LIBDIR'] = os.path.join(conf.env['PREFIX'], 'Libraries')
+               conf.env['DATADIR'] = os.path.join(conf.env['PREFIX'], 'Resources')
+               conf.env['HTMLDIR'] = os.path.join(conf.env['PREFIX'], 'Resources/Documentation')
+               conf.env['MANDIR'] = os.path.join(conf.env['PREFIX'], 'Resources/Man')
+               conf.env['LV2DIR'] = os.path.join(conf.env['PREFIX'], 'PlugIns')
        else:
                conf.env['BUNDLE'] = False
                if Options.options.bindir:
                        conf.env['BINDIR'] = Options.options.bindir
                else:
-                       conf.env['BINDIR'] = conf.env['PREFIX'] + '/bin/'
+                       conf.env['BINDIR'] = os.path.join(conf.env['PREFIX'], 'bin')
                if Options.options.includedir:
                        conf.env['INCLUDEDIR'] = Options.options.includedir
                else:
-                       conf.env['INCLUDEDIR'] = conf.env['PREFIX'] + '/include/'
+                       conf.env['INCLUDEDIR'] = os.path.join(conf.env['PREFIX'], 'include')
                if Options.options.libdir:
                        conf.env['LIBDIR'] = Options.options.libdir
                else:
-                       conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib/'
+                       conf.env['LIBDIR'] = os.path.join(conf.env['PREFIX'], 'lib')
                if Options.options.datadir:
                        conf.env['DATADIR'] = Options.options.datadir
                else:
-                       conf.env['DATADIR'] = conf.env['PREFIX'] + '/share/'
+                       conf.env['DATADIR'] = os.path.join(conf.env['PREFIX'], 'share')
                if Options.options.configdir:
                        conf.env['CONFIGDIR'] = Options.options.configdir
                else:
-                       conf.env['CONFIGDIR'] = conf.env['PREFIX'] + '/etc/'
+                       conf.env['CONFIGDIR'] = os.path.join(conf.env['PREFIX'], 'etc')
                if Options.options.htmldir:
                        conf.env['HTMLDIR'] = Options.options.htmldir
                else:
-                       conf.env['HTMLDIR'] = conf.env['DATADIR'] + 'doc/' + Utils.g_module.APPNAME + '/'
+                       conf.env['HTMLDIR'] = os.path.join(conf.env['DATADIR'], 'doc', Utils.g_module.APPNAME)
                if Options.options.mandir:
                        conf.env['MANDIR'] = Options.options.mandir
                else:
-                       conf.env['MANDIR'] = conf.env['DATADIR'] + 'man/'
+                       conf.env['MANDIR'] = os.path.join(conf.env['DATADIR'], 'man')
                if Options.options.lv2dir:
                        conf.env['LV2DIR'] = Options.options.lv2dir
                else:
                        if Options.options.lv2_user:
                                if sys.platform == "darwin":
-                                       conf.env['LV2DIR'] = os.getenv('HOME') + '/Library/Audio/Plug-Ins/LV2'
+                                       conf.env['LV2DIR'] = os.path.join(os.getenv('HOME'), 'Library/Audio/Plug-Ins/LV2')
                                else:
-                                       conf.env['LV2DIR'] = os.getenv('HOME') + '/.lv2'
+                                       conf.env['LV2DIR'] = os.path.join(os.getenv('HOME'), '.lv2')
                        else:
                                if sys.platform == "darwin":
                                        conf.env['LV2DIR'] = '/Library/Audio/Plug-Ins/LV2'
                                else:
-                                       conf.env['LV2DIR'] = conf.env['LIBDIR'] + 'lv2/'
+                                       conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2')
                
        conf.env['BINDIRNAME'] = chop_prefix(conf, 'BINDIR')
        conf.env['LIBDIRNAME'] = chop_prefix(conf, 'LIBDIR')
@@ -236,10 +227,10 @@ def use_lib(bld, obj, libs):
                                obj.uselib_local = 'lib' + l.lower() + ' '
                
                if in_headers or in_libs:
-                       inc_flag = '-iquote ' + abssrcdir + '/' + l.lower()
+                       inc_flag = '-iquote ' + os.path.join(abssrcdir, l.lower())
                        for f in ['CCFLAGS', 'CXXFLAGS']:
                                if not inc_flag in bld.env[f]:
-                                       bld.env.prepend_value(f, inc_flag)
+                                       bld.env.append_value(f, inc_flag)
                else:
                        if hasattr(obj, 'uselib'):
                                obj.uselib += ' ' + l
@@ -324,11 +315,11 @@ def build_dox(bld, name, version, srcdir, blddir):
        obj.source = 'doc/reference.doxygen.in'
        obj.target = 'doc/reference.doxygen'
        if is_child():
-               src_dir = srcdir + '/' + name.lower()
-               doc_dir = blddir + '/default/' + name.lower() + '/doc'
+               src_dir = os.path.join(srcdir, name.lower())
+               doc_dir = os.path.join(blddir, 'default', name.lower(), 'doc')
        else:
                src_dir = srcdir
-               doc_dir = blddir + '/default/doc'
+               doc_dir = os.path.join(blddir, 'default', 'doc')
        obj.dict = {
                name + '_VERSION' : version,
                name + '_SRCDIR'  : os.path.abspath(src_dir),
@@ -336,6 +327,7 @@ def build_dox(bld, name, version, srcdir, blddir):
        }
        obj.install_path = ''
        out1 = bld.new_task_gen('command-output')
+       out1.dependencies = [obj]
        out1.stdout = '/doc/doxygen.out'
        out1.stdin = '/doc/reference.doxygen' # whatever..
        out1.command = 'doxygen'