from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.72'
+libdcp_version = '1.8.73'
libsub_version = '1.6.42'
-this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
-last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
+git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
# Python 2/3 compatibility; I don't really understand what's going on here
if not isinstance(this_version, str):
this_version = this_version.decode('utf-8')
-if not isinstance(last_version, str):
- last_version = last_version.decode('utf-8')
+if not isinstance(git_head, str):
+ git_head = git_head.decode('utf-8')
-if this_version == '' or this_version == 'merged-to-main':
- VERSION = '%sdevel' % last_version[1:].strip()
+if this_version == '':
+ VERSION = git_head.strip()
else:
VERSION = this_version[1:].strip()
opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile for Windows 64-bit')
opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile for Windows 32-bit')
- opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64')
opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically')
opt.add_option('--static-boost', action='store_true', default=False, help='link statically to Boost')
opt.add_option('--static-wxwidgets', action='store_true', default=False, help='link statically to wxWidgets')
opt.add_option('--enable-disk', action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
opt.add_option('--wx-config', help='path to wx-config')
+ opt.add_option('--enable-asan', action='store_true', help='build with asan')
+ opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch')
def configure(conf):
conf.load('compiler_cxx')
else:
conf.env.INSTALL_PREFIX = conf.options.destdir
+ conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE')
+
# Common CXXFLAGS
conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',
'-D__STDC_LIMIT_MACROS',
'-D_FILE_OFFSET_BITS=64',
'-std=c++11'])
+ if conf.options.disable_more_warnings:
+ # These are for Xcode 15.0.1 with the v2.16.x-era
+ # dependencies; maybe they aren't necessary when building
+ # v2.1{7,8}.x
+ conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-builtins',
+ '-Wno-deprecated-declarations',
+ '-Wno-enum-constexpr-conversion',
+ '-Wno-deprecated-copy'])
+
if conf.options.warnings_are_errors:
conf.env.append_value('CXXFLAGS', '-Werror')
- if not conf.options.target_macos_arm64:
- conf.env.append_value('CXXFLAGS', '-msse')
+ if conf.env.SSE:
+ conf.env.append_value('CXXFLAGS', ['-msse', '-mfpmath=sse'])
+
+ if conf.options.enable_asan:
+ conf.env.append_value('CXXFLAGS', '-fsanitize=address')
+ conf.env.append_value('LINKFLAGS', '-fsanitize=address')
if conf.env['CXX_NAME'] == 'gcc':
gcc = conf.env['CC_VERSION']
pass
#
- # Windows/Linux/OS X specific
+ # Windows/Linux/macOS specific
#
# Windows
conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN')
conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H')
conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
- conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-Wcast-align')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
""",
msg='Checking for boost locale library',
- libpath='/usr/local/lib',
lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_LOCALE')
# Linux
if conf.env.TARGET_LINUX:
- conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
mandatory=True,
msg='Checking for libicu',
okmsg='yes',
- libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'],
+ libpath=['/usr/lib', '/usr/lib/x86_64-linux-gnu'],
lib=['icuio', 'icui18n', 'icudata', 'icuuc'],
uselib_store='ICU')
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
conf.check_cxx(fragment="""
#include <zip.h>
- int main() { zip_source_t* foo; }
+ int main() { zip_source_t* foo; (void)foo; }
""",
mandatory=False,
msg="Checking for zip_source_t",
uselib="ZIP",
define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
)
+ conf.check_cxx(fragment="""
+ #include <zip.h>
+ int main() { struct zip* zip = nullptr; zip_source_t* source = nullptr; zip_file_add(zip, "foo", source, ZIP_FL_ENC_GUESS); }
+ """,
+ mandatory=False,
+ msg="Checking for zip_file_add",
+ uselib="ZIP",
+ define_name='DCPOMATIC_HAVE_ZIP_FILE_ADD'
+ )
+ conf.check_cxx(fragment="""
+ #include <zip.h>
+ int main() { int error; zip_open("foo", ZIP_RDONLY, &error); }
+ """,
+ mandatory=False,
+ msg="Checking for ZIP_RDONLY",
+ uselib="ZIP",
+ define_name='DCPOMATIC_HAVE_ZIP_RDONLY'
+ )
# libbz2; must be explicitly linked on macOS for some reason
conf.check_cxx(fragment="""
uselib_store="BZ2"
)
+ # libz; must be explicitly linked on macOS for some reason
+ conf.check_cxx(fragment="""
+ #include <zlib.h>
+ int main() { zlibVersion(); }
+ """,
+ mandatory=True,
+ msg="Checking for libz",
+ okmsg='yes',
+ lib='z',
+ uselib_store="LIBZ"
+ )
+
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
""",
msg='Checking for libjpeg',
- libpath='/usr/local/lib',
lib=['jpeg'],
uselib_store='JPEG')
int main() { ext4_mount("ext4_fs", "/mp/", false); }\n
""",
msg='Checking for lwext4 library',
- libpath='/usr/local/lib',
lib=['lwext4', 'blockdev'],
uselib_store='LWEXT4')
int main() { boost::thread t; }\n
""",
msg='Checking for boost threading library',
- libpath='/usr/local/lib',
lib=[boost_thread, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_THREAD')
int main() { boost::filesystem::copy_file ("a", "b"); }\n
""",
msg='Checking for boost filesystem library',
- libpath='/usr/local/lib',
lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_FILESYSTEM')
int main() { boost::gregorian::day_clock::local_day(); }\n
""",
msg='Checking for boost datetime library',
- libpath='/usr/local/lib',
lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_DATETIME')
elif conf.env.TARGET_LINUX:
Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': Linux')
elif conf.env.TARGET_OSX:
- Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': OS X')
+ Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': macOS')
def report(name, variable):
linkage = ''
projects / dcpomatic.git / blobdiff