clang_dict['fpmath-sse'] = ''
clang_dict['xmmintrinsics'] = ''
clang_dict['silence-unused-arguments'] = '-Qunused-arguments'
-clang_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual', '-Wno-mismatched-tags', '-Wno-cast-align', '-Wno-unused-local-typedefs' ]
+clang_dict['extra-cxx-warnings'] = [ '-Woverloaded-virtual', '-Wno-mismatched-tags', '-Wno-cast-align', '-Wno-unused-local-typedefs', '-Wunneeded-internal-declaration' ]
clang_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', '-fstrict-overflow' ]
clang_dict['strict'] = ['-Wall', '-Wcast-align', '-Wextra', '-Wwrite-strings' ]
clang_dict['generic-x86'] = [ '-arch', 'i386' ]
clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math']
compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
-def fetch_git_revision ():
- cmd = "git describe HEAD | sed 's/^[A-Za-z0-9]*+//'"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- rev = output[0].decode ('utf-8')
- return rev
+def fetch_git_revision_date ():
+ cmd = ["git", "describe", "HEAD"]
+ output = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ rev = re.sub(r"^[A-Za-z0-9]*\+", "", output[0].decode('utf-8'))
+
+ cmd = ["git", "log", "-1", "--pretty=format:%ci", "HEAD"]
+ output = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ date = output[0].decode('utf-8').split(None, 2)[0]
+
+ return rev, date
-def fetch_tarball_revision ():
+def fetch_tarball_revision_date():
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', '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)
+
+ raw_line_tokens = content[1].decode('utf-8').strip().split(' ')
+ rev = raw_line_tokens[7].translate(remove_punctuation_map)
+ date = raw_line_tokens[12].translate(remove_punctuation_map)
+
+ return rev, date
if os.path.isdir (os.path.join(os.getcwd(), '.git')):
- rev = fetch_git_revision ()
+ rev, rev_date = fetch_git_revision_date()
else:
- rev = fetch_tarball_revision ()
+ rev, rev_date = fetch_tarball_revision_date()
#
# rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
'libs/qm-dsp',
'libs/vamp-plugins',
'libs/zita-resampler',
+ 'libs/zita-convolver',
# core ardour libraries
'libs/pbd',
'libs/midi++2',
'libs/waveview',
'libs/plugins/reasonablesynth.lv2',
'libs/plugins/a-comp.lv2',
+ 'libs/plugins/a-exp.lv2',
'libs/plugins/a-delay.lv2',
'libs/plugins/a-eq.lv2',
'libs/plugins/a-reverb.lv2',
'mcp',
'osc',
'patchfiles',
+ 'plugin_metadata',
'scripts',
'headless',
'session_utils',
def create_stored_revision():
rev = ""
if os.path.exists('.git'):
- rev = fetch_git_revision();
+ rev, rev_date = fetch_git_revision_date();
print("Git version: " + rev + "\n")
elif os.path.exists('libs/ardour/revision.cc'):
print("Using packaged revision")
try:
#
- # if you change the format of this, be sure to fix fetch_tarball_revision() above
- # so that it still works.
+ # if you change the format of this, be sure to fix fetch_tarball_revision_date()
+ # above so that it still works.
#
text = '#include "ardour/revision.h"\n'
- text += 'namespace ARDOUR { const char* revision = \"%s\"; }\n' % rev
- print('Writing revision info to libs/ardour/revision.cc using ' + rev)
+ text += (
+ 'namespace ARDOUR { const char* revision = \"%s\"; '
+ 'const char* date = \"%s\"; }\n'
+ ) % (rev, rev_date)
+ print('Writing revision info to libs/ardour/revision.cc using ' + rev + ', ' + rev_date)
o = open('libs/ardour/revision.cc', 'w')
o.write(text)
o.close()
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"))
('-D__STDC_LIMIT_MACROS', '-D__STDC_FORMAT_MACROS',
'-DCANVAS_COMPATIBILITY', '-DCANVAS_DEBUG'))
- if opt.nls:
- compiler_flags.append('-DENABLE_NLS')
-
# use sparingly, prefer runtime profile
if Options.options.program_name.lower() == "mixbus":
compiler_flags.append ('-DMIXBUS')
if opts.nls:
conf.define('ENABLE_NLS', 1)
conf.env['ENABLE_NLS'] = True
+ else:
+ conf.define('ENABLE_NLS', 0)
+ conf.env['ENABLE_NLS'] = False
if opts.build_tests:
conf.env['BUILD_TESTS'] = True
conf.env['RUN_TESTS'] = opts.run_tests
def build(bld):
create_stored_revision()
+ bld.env['DATE'] = rev_date
+
# add directories that contain only headers, to workaround an issue with waf
if not bld.is_defined('USE_EXTERNAL_LIBS'):
projects / ardour.git / blobdiff