import glob
import distutils
import distutils.spawn
-from waflib import Logs
+from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.4.0devel'
+VERSION = '2.4.12'
def options(opt):
opt.load('compiler_cxx')
lib=['boost_regex%s' % boost_lib_suffix],
uselib_store='BOOST_REGEX')
+ # libxml++ requires glibmm and versions of glibmm 2.45.31 and later
+ # must be built with -std=c++11 as they use c++11
+ # features and c++11 is not (yet) the default in gcc.
+ glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH)
+ s = glibmm_version.split('.')
+ v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
+ if v >= 0x022D1F:
+ conf.env.append_value('CXXFLAGS', '-std=c++11')
+
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')
create_version_cc(VERSION, bld.env.CXXFLAGS)
bld.recurse('src')
+ bld.recurse('graphics')
+
if not bld.env.DISABLE_TESTS:
bld.recurse('test')
if bld.env.TARGET_WINDOWS:
if bld.env.TARGET_OSX:
bld.recurse('platform/osx')
- for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
- bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r)
-
if not bld.env.TARGET_WINDOWS:
- bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png')
- bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/splash.png')
bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
bld.add_post_fun(post)
bld.recurse('src')
def tags(bld):
- os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc src/tools/*.h')
-
-def zanata_pull(bld):
- os.system('zanata-cli -B -q pull -t .')
- for f in glob.glob('src/lib/po/*.po'):
- l = os.path.basename(f)
- os.rename('dcpomatic_%s' % l, 'src/tools/po/%s' % l)
- os.rename('libdcpomatic_%s' % l, 'src/lib/po/%s' % l)
- os.rename('libdcpomatic-wx_%s' % l, 'src/wx/po/%s' % l)
+ os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc')
def cppcheck(bld):
os.system('cppcheck --enable=all --quiet .')