X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=7671975f4a4f4b009430bc32bd730572b63254b3;hb=refs%2Ftags%2Fv2.1.14;hp=d10f7782ef639e0776c226b94bfbfecf8380879c;hpb=13ac24a8090b8f5422ad11fe45f05bc2fc4364d4;p=dcpomatic.git diff --git a/wscript b/wscript index d10f7782e..7671975f4 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.11devel' +VERSION = '2.1.14' def options(opt): opt.load('compiler_cxx') @@ -180,7 +180,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') if graphics is not None: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') - + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) @@ -345,11 +345,11 @@ def configure(conf): # Other stuff conf.find_program('msgfmt', var='MSGFMT') - + datadir = conf.env.DATADIR if not datadir: datadir = os.path.join(conf.env.PREFIX, 'share') - + conf.define('LOCALEDIR', os.path.join(datadir, 'locale')) conf.define('DATADIR', datadir) @@ -436,7 +436,7 @@ def create_version_cc(version, cxx_flags): if commit is None and os.path.exists('.git_revision'): f = open('.git_revision', 'r') commit = f.readline().strip() - + if commit is None: commit = 'release' @@ -458,7 +458,7 @@ def create_version_cc(version, cxx_flags): except IOError: print('Could not open src/lib/version.cc for writing\n') sys.exit(-1) - + def post(ctx): if ctx.cmd == 'install': ctx.exec_command('/sbin/ldconfig') @@ -479,3 +479,6 @@ def zanata_pull(bld): 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) + +def cppcheck(bld): + os.system('cppcheck --enable=all --quiet .')