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)
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:
'libs/audiographer',
'libs/canvas',
'libs/widgets',
+ 'libs/waveview',
'libs/plugins/reasonablesynth.lv2',
'libs/plugins/a-comp.lv2',
'libs/plugins/a-delay.lv2',
conf.env['build_host'] = 'el_capitan'
elif re.search ("^16[.]", version) != None:
conf.env['build_host'] = 'sierra'
+ elif re.search ("^17[.]", version) != None:
+ conf.env['build_host'] = 'high_sierra'
else:
conf.env['build_host'] = 'irrelevant'
conf.env['build_target'] = 'yosemite'
elif re.search ("^15[.]", version) != None:
conf.env['build_target'] = 'el_capitan'
- else:
+ elif re.search ("^16[.]", version) != None:
conf.env['build_target'] = 'sierra'
+ else:
+ conf.env['build_target'] = 'high_sierra'
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
#
compiler_flags.append ('-U__STRICT_ANSI__')
- if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan', 'sierra' ]:
+ if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan', 'sierra', 'high_sierra' ]:
cxx_flags.append('--stdlib=libc++')
linker_flags.append('--stdlib=libc++')
- if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra' ]:
+ if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra' ]:
conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11')
if platform == "darwin":
# from requiring a full path to requiring just the header name.
cxx_flags.append('-DCARBON_FLAT_HEADERS')
- if not opt.use_libcpp and not conf.env['build_host'] in [ 'el_capitan', 'sierra' ]:
+ if not opt.use_libcpp and not conf.env['build_host'] in [ 'el_capitan', 'sierra', 'high_sierra' ]:
cxx_flags.append('--stdlib=libstdc++')
linker_flags.append('--stdlib=libstdc++')
# Prevents visibility issues in standard headers
cxx_flags.append('-DBOOST_NO_AUTO_PTR')
- if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra' ]:
+ if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra' ]:
# Silence warnings about the non-existing osx clang compiler flags
# -compatibility_version and -current_version. These are Waf
# generated and not needed with clang
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.8"))
- elif conf.env['build_target'] in ['el_capitan', 'sierra' ]:
+ elif conf.env['build_target'] in ['el_capitan', 'sierra', 'high_sierra' ]:
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.9"))
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',
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)
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'))
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)
projects / ardour.git / blobdiff