X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2f7b62d2240ce337c68d1c2081db84393f9372f5;hb=4bfc5ddf71728c1f14a3fbff5dab4986fbabe15c;hp=a7c3e1d26f0c8ca349a98267bc4d1da66e66c014;hpb=24f7ae4cf639c91a8533103b5ecf531b9b06e00f;p=ardour.git diff --git a/wscript b/wscript index a7c3e1d26f..2f7b62d224 100644 --- a/wscript +++ b/wscript @@ -157,7 +157,7 @@ def fetch_tarball_revision (): if not os.path.exists ('libs/ardour/revision.cc'): print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc') sys.exit (1) - with open('libs/ardour/revision.cc') as f: + with open('libs/ardour/revision.cc', 'rb') as f: content = f.readlines() remove_punctuation_map = dict((ord(char), None) for char in '";') return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map) @@ -182,12 +182,29 @@ else: MICRO = '0' V = MAJOR + '.' + MINOR + '.' + MICRO -# Ensure that these are not unicode, which -# can cause odd problems elsewhere. Note that -# in python3, encode and decode do not return -# strings, so we have to force the type. -VERSION = V.encode ('ascii', 'ignore').decode ("utf-8") -PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore').decode ("utf-8") + +def sanitize(s): + # round-trip to remove anything in the string that is not encodable in + # ASCII, yet still keep a real (utf8-encoded internally) string. + s = s.encode ('ascii', 'ignore').decode ("utf-8") + # In Python3, bytes is the class of binary content and encode() returns + # bytes to transform a string according to a text encoding; str is the + # class of normal strings (utf8-encoded internally) and decode() returns + # that type. + # Python 2 did not initially cater for encoding problems and can use str + # for both binary content and for (decoded) strings. The Unicode type was + # added to correspond to Python 3 str, and the Python 2 str type should + # only correspond to bytes. Alas, almost everything in the Python 2 + # ecosystem has been written with str in mind and doesn't handle Unicode + # objects correctly. If Python 2 is in use, s will be a Unicode object and + # to avoid strange problems later we convert back to str, but in utf-8 + # nonetheless. + if not isinstance(s, str): + s = s.encode("utf-8") + return s +VERSION = sanitize(V) +PROGRAM_VERSION = sanitize(MAJOR) +del sanitize if len (sys.argv) > 1 and sys.argv[1] == 'dist': if not 'APPNAME' in os.environ: @@ -208,6 +225,7 @@ children = [ 'libs/ptformat', 'libs/qm-dsp', 'libs/vamp-plugins', + 'libs/zita-resampler', # core ardour libraries 'libs/pbd', 'libs/midi++2', @@ -220,6 +238,8 @@ children = [ 'libs/gtkmm2ext', 'libs/audiographer', 'libs/canvas', + 'libs/widgets', + 'libs/waveview', 'libs/plugins/reasonablesynth.lv2', 'libs/plugins/a-comp.lv2', 'libs/plugins/a-delay.lv2', @@ -239,7 +259,6 @@ children = [ 'libs/fst', 'libs/vfork', 'libs/ardouralsautil', - 'cfgtool', 'tools/luadevel', ] @@ -285,6 +304,13 @@ def create_stored_revision(): print('Could not open libs/ardour/revision.cc for writing\n') sys.exit(-1) +def get_depstack_rev(depstack_root): + try: + with open(depstack_root + '/../.vers', 'r') as f: + return f.readline() + except IOError: + return '-unknown-'; + def set_compiler_flags (conf,opt): # # Compiler flags and other system-dependent stuff @@ -538,12 +564,12 @@ int main() { return 0; }''', ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070", '-mmacosx-version-min=10.7')) - elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]: + elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]: compiler_flags.extend( ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090", "-mmacosx-version-min=10.8")) - elif conf.env['build_target'] in [ 'sierra' ]: + elif conf.env['build_target'] in ['el_capitan', 'sierra' ]: compiler_flags.extend( ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090", "-mmacosx-version-min=10.9")) @@ -722,6 +748,8 @@ def options(opt): help='Compile Tool to dump LuaBindings (needs C++11)') opt.add_option('--canvasui', action='store_true', default=False, dest='canvasui', help='Compile libcanvas test GUI') + opt.add_option('--beatbox', action='store_true', default=False, dest='beatbox', + help='Compile beatbox test app') opt.add_option('--lv2', action='store_true', default=True, dest='lv2', help='Compile with support for LV2 (if Lilv+Suil is available)') opt.add_option('--no-lv2', action='store_false', dest='lv2', @@ -852,8 +880,10 @@ def configure(conf): conf.env.append_value('CXXFLAGS', [prefinclude ]) conf.env.append_value('LINKFLAGS', [ preflib ]) autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes') + conf.env['DEPSTACK_REV'] = get_depstack_rev (Options.options.depstack_root) else: autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no') + conf.env['DEPSTACK_REV'] = '-system-' if sys.platform == 'darwin': conf.define ('NEED_INTL', 1) @@ -949,6 +979,10 @@ def configure(conf): conf.env['CANVASTESTUI'] = True conf.define ('CANVASTESTUI', 1) + if Options.options.beatbox: + conf.env['BEATBOX'] = True + conf.define ('BEATBOX', 1) + if Options.options.luadoc: conf.env['LUABINDINGDOC'] = True conf.define ('LUABINDINGDOC', 1) @@ -1229,6 +1263,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('AudioUnits', conf.is_defined('AUDIOUNIT_SUPPORT')) write_config_text('Build target', conf.env['build_target']) write_config_text('Canvas Test UI', conf.is_defined('CANVASTESTUI')) + write_config_text('Beatbox test app', conf.is_defined('BEATBOX')) write_config_text('CoreAudio', conf.is_defined('HAVE_COREAUDIO')) write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105')) write_config_text('Debug RT allocations', conf.is_defined('DEBUG_RT_ALLOC')) @@ -1253,6 +1288,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('PT format', conf.is_defined('PTFORMAT')) write_config_text('PTW32 Semaphore', conf.is_defined('USE_PTW32_SEMAPHORE')) # write_config_text('Soundtouch', conf.is_defined('HAVE_SOUNDTOUCH')) + write_config_text('Threaded WaveViews', not opts.no_threaded_waveviews) write_config_text('Translation', opts.nls) # write_config_text('Tranzport', opts.tranzport) write_config_text('Unit tests', conf.env['BUILD_TESTS']) @@ -1266,6 +1302,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('Dummy backend', conf.env['BUILD_DUMMYBACKEND']) write_config_text('JACK Backend', conf.env['BUILD_JACKBACKEND']) config_text.write("\\n\\\n") + write_config_text('Builstack', conf.env['DEPSTACK_REV']) write_config_text('Mac i386 Architecture', opts.generic) write_config_text('Mac ppc Architecture', opts.ppc) config_text.write("\\n\\\n") @@ -1327,8 +1364,13 @@ def build(bld): for i in children: bld.recurse(i) + if bld.is_defined ('BEATBOX'): + bld.recurse('tools/bb') + bld.install_files (bld.env['CONFDIR'], 'system_config') + bld.install_files (os.path.join (bld.env['DATADIR'], 'templates'), bld.path.ant_glob ('templates/**'), cwd=bld.path.find_dir ('templates'), relative_trick=True) + if bld.env['RUN_TESTS']: bld.add_post_fun(test)