X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=6d1324ab96458a3e8d09e56d7164c1daebae58bd;hb=b62c305f200351b2cbae70de8327fa235ff515dc;hp=ed45d7bad6d61b959913a15c50f4f003fed1c19d;hpb=843d5ffa59d0faece831120ce8b657b548835272;p=ardour.git diff --git a/wscript b/wscript index ed45d7bad6..6d1324ab96 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', @@ -287,7 +307,7 @@ def create_stored_revision(): def get_depstack_rev(depstack_root): try: with open(depstack_root + '/../.vers', 'r') as f: - return f.readline() + return f.readline().decode('utf-8').strip()[:7] except IOError: return '-unknown-'; @@ -728,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', @@ -762,6 +784,8 @@ def options(opt): help="Build a single executable for each unit test") #opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport', # help='Compile with support for Frontier Designs Tranzport (if libusb is available)') + opt.add_option('--maschine', action='store_true', default=False, dest='maschine', + help='Compile with support for NI-Maschine') opt.add_option('--generic', action='store_true', default=False, dest='generic', help='Compile with -arch i386 (OS X ONLY)') opt.add_option('--ppc', action='store_true', default=False, dest='ppc', @@ -850,7 +874,9 @@ def configure(conf): pkg_config_path = os.getenv('PKG_CONFIG_PATH') user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst') - if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0: + if os.getenv('DEPSTACK_ROOT') is not None and os.path.exists (os.getenv('DEPSTACK_ROOT') + '/lib'): + conf.env['DEPSTACK_REV'] = get_depstack_rev (os.getenv('DEPSTACK_ROOT') + '/lib') + elif pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0: # told to search user_gtk_root prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) preflib = ''.join ([ '-L', user_gtk_root + '/lib']) @@ -858,7 +884,7 @@ 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) + conf.env['DEPSTACK_REV'] = get_depstack_rev (user_gtk_root) else: autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no') conf.env['DEPSTACK_REV'] = '-system-' @@ -957,6 +983,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) @@ -1237,6 +1267,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 +1284,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('LV2 extensions', conf.is_defined('LV2_EXTENDED')) write_config_text('LXVST support', conf.is_defined('LXVST_SUPPORT')) write_config_text('Mac VST support', conf.is_defined('MACVST_SUPPORT')) + write_config_text('NI-Maschine', opts.maschine) write_config_text('OGG', conf.is_defined('HAVE_OGG')) write_config_text('Phone home', conf.is_defined('PHONE_HOME')) write_config_text('Process thread timing', conf.is_defined('PT_TIMING')) @@ -1275,7 +1307,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('Buildstack', 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") @@ -1337,8 +1369,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)