# 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('--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-studio', 'swaroop-theater'])
+ opt.add_option('--variant', help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater'])
+ opt.add_option('--enable-player-stress-test', action='store_true', default=False, help='build the player with stress testing enabled')
+ opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker')
def configure(conf):
conf.load('compiler_cxx')
'-msse',
'-fno-strict-aliasing',
'-Wall',
- '-Wcast-align',
'-Wextra',
'-Wwrite-strings',
# Remove auto_ptr warnings from libxml++-2.6
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'])
if conf.options.variant.startswith('swaroop-'):
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP')
+ if conf.options.enable_player_stress_test:
+ conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_PLAYER_STRESS_TEST')
+
+ 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.options.static_dcp:
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.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
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 -m 2 -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
projects / dcpomatic.git / blobdiff