X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=autowaf.py;h=e59c134a4383f5ca8ff6053583ed6df968d46cf2;hb=395efbc32d02fda70df50079bedee35c355b3b37;hp=3439db9d78499aaeebfb0b32ea9193fe7f976c8d;hpb=16d97766465ba87cd69412836d65e68395e84943;p=ardour.git diff --git a/autowaf.py b/autowaf.py index 3439db9d78..e59c134a43 100644 --- a/autowaf.py +++ b/autowaf.py @@ -52,6 +52,8 @@ def set_options(opt): help="Header files [Default: PREFIX/include]") opt.add_option('--datadir', type='string', help="Shared data [Default: PREFIX/share]") + opt.add_option('--configdir', type='string', + help="Configuration data [Default: PREFIX/etc]") opt.add_option('--mandir', type='string', help="Manual pages [Default: DATADIR/man]") opt.add_option('--htmldir', type='string', @@ -79,19 +81,14 @@ 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('-', '_').replace('.', '_') def check_pkg(conf, name, **args): + if not 'mandatory' in args: + args['mandatory'] = True "Check for a package iff it hasn't been checked for yet" - var_name = 'HAVE_' + args['uselib_store'].replace('/', '_') + var_name = 'HAVE_' + nameify(args['uselib_store']) check = not var_name in conf.env if not check and 'atleast_version' in args: # Re-check if version is newer than previous check @@ -122,83 +119,92 @@ def configure(conf): global g_step if g_step > 1: return - def append_cxx_flags(val): - conf.env.append_value('CCFLAGS', val) - conf.env.append_value('CXXFLAGS', val) - conf.line_just = 42 - check_tool(conf, 'misc') - check_tool(conf, 'compiler_cc') - check_tool(conf, 'compiler_cxx') + def append_cxx_flags(vals): + conf.env.append_value('CCFLAGS', vals.split()) + conf.env.append_value('CXXFLAGS', vals.split()) + conf.line_just = 43 + 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'] = 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') conf.env['DATADIRNAME'] = chop_prefix(conf, 'DATADIR') + conf.env['CONFIGDIRNAME'] = chop_prefix(conf, 'CONFIGDIR') conf.env['LV2DIRNAME'] = chop_prefix(conf, 'LV2DIR') if Options.options.debug: - conf.env['CCFLAGS'] = '-O0 -g -std=c99' - conf.env['CXXFLAGS'] = '-O0 -g -ansi' + conf.env['CCFLAGS'] = [ '-O0', '-g' ] + conf.env['CXXFLAGS'] = [ '-O0', '-g' ] + else: + append_cxx_flags('-DNDEBUG') if Options.options.strict: - conf.env['CCFLAGS'] = '-O0 -g -std=c99 -pedantic' + conf.env.append_value('CCFLAGS', [ '-std=c99', '-pedantic' ]) + conf.env.append_value('CXXFLAGS', [ '-ansi', '-Woverloaded-virtual']) append_cxx_flags('-Wall -Wextra -Wno-unused-parameter') - conf.env.append_value('CXXFLAGS', '-Woverloaded-virtual') - append_cxx_flags('-fPIC -DPIC') + append_cxx_flags('-fPIC -DPIC -fshow-column') g_step = 2 def set_local_lib(conf, name, has_objects): - conf.define('HAVE_' + name.upper().replace('/', '_'), 1) + conf.define('HAVE_' + nameify(name.upper()), 1) if has_objects: if type(conf.env['AUTOWAF_LOCAL_LIBS']) != dict: conf.env['AUTOWAF_LOCAL_LIBS'] = {} @@ -221,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 @@ -254,6 +260,7 @@ def print_summary(conf): display_header('Global configuration') display_msg(conf, "Install prefix", conf.env['PREFIX']) display_msg(conf, "Debuggable build", str(conf.env['DEBUG'])) + display_msg(conf, "Strict compiler flags", str(conf.env['STRICT'])) display_msg(conf, "Build documentation", str(conf.env['BUILD_DOCS'])) print g_step = 3 @@ -308,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), @@ -320,12 +327,45 @@ 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' out1.argv = [os.path.abspath(doc_dir) + '/reference.doxygen'] out1.command_is_external = True +# Version code file generation +def build_version_files(header_path, source_path, domain, major, minor, micro): + header_path = os.path.abspath(header_path) + source_path = os.path.abspath(source_path) + text = "int " + domain + "_major_version = " + str(major) + ";\n" + text += "int " + domain + "_minor_version = " + str(minor) + ";\n" + text += "int " + domain + "_micro_version = " + str(micro) + ";\n" + try: + o = file(source_path, 'w') + o.write(text) + o.close() + except IOError: + print "Could not open", source_path, " for writing\n" + sys.exit(-1) + + text = "#ifndef __" + domain + "_version_h__\n" + text += "#define __" + domain + "_version_h__\n" + text += "extern const char* " + domain + "_revision;\n" + text += "extern int " + domain + "_major_version;\n" + text += "extern int " + domain + "_minor_version;\n" + text += "extern int " + domain + "_micro_version;\n" + text += "#endif /* __" + domain + "_version_h__ */\n" + try: + o = file(header_path, 'w') + o.write(text) + o.close() + except IOError: + print "Could not open", header_path, " for writing\n" + sys.exit(-1) + + return None + def shutdown(): # This isn't really correct (for packaging), but people asking is annoying if Options.commands['install']: