#
-# Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
# along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import print_function
+
import subprocess
import os
import shlex
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 --abbrev=0'), 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 this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else:
opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation')
opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools')
- opt.add_option('--player-only', action='store_true', default=False, help='just build the player; no other tools')
opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed')
opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
opt.add_option('--static-curl', action='store_true', default=False, help='link statically to libcurl')
opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11')
- opt.add_option('--variant', help='build variant', choices=['swaroop'])
+ opt.add_option('--variant', help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater'])
+ opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker')
def configure(conf):
conf.load('compiler_cxx')
# Save conf.options that we need elsewhere in conf.env
conf.env.DISABLE_GUI = conf.options.disable_gui
- conf.env.PLAYER_ONLY = conf.options.player_only
conf.env.DISABLE_TESTS = conf.options.disable_tests
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.TARGET_OSX = sys.platform == 'darwin'
'-msse',
'-fno-strict-aliasing',
'-Wall',
- '-Wcast-align',
'-Wextra',
'-Wwrite-strings',
# Remove auto_ptr warnings from libxml++-2.6
'-Wno-deprecated-declarations',
'-Wno-ignored-qualifiers',
+ '-Wno-parentheses',
'-D_FILE_OFFSET_BITS=64'])
if conf.options.force_cpp11:
conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
- gcc = conf.env['CC_VERSION']
- if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
- conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
- have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+ if conf.env['CXX_NAME'] == 'gcc':
+ gcc = conf.env['CC_VERSION']
+ if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
+ conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+ if int(gcc[0]) >= 9:
+ conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy'])
+ have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+ else:
+ have_c11 = False
if conf.options.enable_debug:
conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
conf.env.append_value('CXXFLAGS', '-O2')
if conf.options.variant is not None:
- conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_%s' % conf.options.variant.upper())
+ conf.env.VARIANT = conf.options.variant
+ if conf.options.variant.startswith('swaroop-'):
+ conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP')
+
+ if conf.options.use_lld:
+ try:
+ conf.find_program('ld.lld')
+ conf.env.append_value('LINKFLAGS', '-fuse-ld=lld')
+ except conf.errors.ConfigurationError:
+ pass
#
# Windows/Linux/OS X specific
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', '-std=c++11')
+ conf.env.append_value('CXXFLAGS', '-Wcast-align')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
if conf.options.enable_debug:
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/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
- conf.env.append_value('CXXFLAGS', ['-Wlogical-op'])
+ conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
if not conf.env.DISABLE_GUI:
conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
if conf.env.TARGET_OSX:
conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
+ else:
+ # Avoid the endless warnings about _t uninitialized in optional<>
+ conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized')
#
# Dependencies.
# glib
conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
- # ImageMagick / GraphicsMagick
- if distutils.spawn.find_executable('Magick++-config'):
- conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
- conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
- else:
- image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
- graphics = None
- if image is None:
- graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
- if image is None and graphics is None:
- Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
- if image is not None:
- conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
- if graphics is not None:
- conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK')
-
- # See if we are using the MagickCore or MagickLib namespaces
- conf.check_cxx(fragment="""
- #include <Magick++/Include.h>\n
- using namespace MagickCore;\n
- int main () { return 0; }\n
- """,
- mandatory=False,
- msg='Checking for MagickCore namespace',
- okmsg='yes',
- includes=conf.env['INCLUDES_MAGICK'],
- define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE')
-
- conf.check_cxx(fragment="""
- #include <Magick++/Include.h>\n
- using namespace MagickLib;\n
- int main () { return 0; }\n
- """,
- mandatory=False,
- msg='Checking for MagickLib namespace',
- okmsg='yes',
- includes=conf.env['INCLUDES_MAGICK'],
- define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE')
-
- # See where MagickCore.h is
- conf.check_cxx(fragment="""
- #include <magick/MagickCore.h>\n
- int main() { return 0; }\n
- """,
- mandatory=False,
- msg='Checking for MagickCore.h location',
- okmsg='magick',
- errmsg='not magick',
- includes=conf.env['INCLUDES_MAGICK'],
- define_name='DCPOMATIC_MAGICKCORE_MAGICK')
-
- conf.check_cxx(fragment="""
- #include <MagickCore/MagickCore.h>\n
- int main() { return 0; }\n
- """,
- mandatory=False,
- msg='Checking for MagickCore.h location',
- okmsg='MagickCore',
- errmsg='not MagickCore',
- includes=conf.env['INCLUDES_MAGICK'],
- define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
-
- # See if we have advanced compare() methods in Magick
- conf.check_cxx(fragment="""
- #include <Magick++.h>\n
- int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); }
- """,
- mandatory=False,
- msg='Checking for advanced compare() method in {Image/Graphics}Magick',
- uselib='MAGICK',
- define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE'
- )
-
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
conf.check_cxx(fragment="""
# libcxml
if conf.options.static_cxml:
- conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
- conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
# libssh
if conf.options.static_ssh:
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
- conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
- conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
+ conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
+ conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.7', args='--cflags', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.4.7', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
# nettle
conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True)
+ # libpng
+ conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
+
# FFmpeg
if conf.options.static_ffmpeg:
names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample']
int main () { av_ebur128_get_true_peaks (0); }\n
""",
msg='Checking for EBUR128-patched FFmpeg',
- libpath=conf.env['LIBPATH_AVFORMAT'],
- lib='avfilter avutil swresample',
- includes=conf.env['INCLUDES_AVFORMAT'],
+ uselib='AVCODEC AVFILTER',
define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
mandatory=False)
""",
msg='Checking for AVSubtitleRect::pict',
cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
- libpath=conf.env['LIBPATH_AVCODEC'],
- lib='avcodec',
- includes=conf.env['INCLUDES_AVCODEC'],
+ uselib='AVCODEC',
define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT',
mandatory=False)
""",
msg='Checking for AVComponentDescriptor::depth_minus1',
cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
- libpath=conf.env['LIBPATH_AVUTIL'],
- lib='avutil',
- includes=conf.env['INCLUDES_AVUTIL'],
+ uselib='AVUTIL',
define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
mandatory=False)
# Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags
- # to these variables. We don't want to use these for the actual build, so clearn them out.
+ # to these variables. We don't want to use these for the actual build, so clean them out.
conf.env['CXXFLAGS_AVCODEC'] = []
conf.env['CXXFLAGS_AVUTIL'] = []
+ if conf.env.TARGET_LINUX:
+ conf.env.LIB_X11 = ['X11']
+
# Boost
if conf.options.static_boost:
conf.env.STLIB_BOOST_THREAD = ['boost_thread']
Logs.pprint('YELLOW', '')
def download_supporters(can_fail):
- last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
- r = os.system('curl -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
+ r = os.system('curl -m 2 -s -f https://dcpomatic.com/supporters.cc > src/wx/supporters.cc')
if (r >> 8) == 0:
- r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()}))
- if (r >> 8) != 0 and can_fail:
- raise Exception("Could not download supporters lists")
+ r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc > src/wx/subscribers.cc')
+ if (r >> 8) != 0:
+ if can_fail:
+ raise Exception("Could not download supporters lists (%d)" % (r >> 8))
+ else:
+ f = open('src/wx/supporters.cc', 'w')
+ print('supported_by.Add(wxT("Debug build - no supporters lists available"));', file=f)
+ f.close()
+ f = open('src/wx/subscribers.cc', 'w')
+ print('subscribers.Add(wxT("Debug build - no subscribers lists available"));', file=f)
+ f.close()
def build(bld):
create_version_cc(VERSION, bld.env.CXXFLAGS)
r = git_revision()
if r is not None:
f = open('.git_revision', 'w')
- print >>f,r
- f.close()
+ print(r, file=f)
+ f.close()
ctx.excl = """
TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git
sys.exit(-1)
def post(ctx):
- if ctx.cmd == 'install':
+ if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
ctx.exec_command('/sbin/ldconfig')
+ # I can't find anything which tells me where things have been installed to,
+ # so here's some nasty hacks to guess.
+ debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/dcpomatic2_uuid')
+ prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/dcpomatic2_uuid')
+ if os.path.exists(debian):
+ os.chmod(debian, 0o4755)
+ if os.path.exists(prefix):
+ os.chmod(prefix, 0o4755)
def pot(bld):
bld.recurse('src')
projects / dcpomatic.git / blobdiff