projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index f466266fd00d319c68fd6239c3f5df3ad633f1c8..d450ab7bbb86614156d608450356bc97e023f12b 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-26,7
+26,7
@@
import distutils.spawn
from waflib import Logs
APPNAME = 'dcpomatic'
from waflib import Logs
APPNAME = 'dcpomatic'
-VERSION = '2.
1.6
'
+VERSION = '2.
3.2
'
def options(opt):
opt.load('compiler_cxx')
def options(opt):
opt.load('compiler_cxx')
@@
-75,7
+75,6
@@
def configure(conf):
'-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS',
'-msse',
'-D__STDC_LIMIT_MACROS',
'-D__STDC_FORMAT_MACROS',
'-msse',
- '-ffast-math',
'-fno-strict-aliasing',
'-Wall',
'-Wno-attributes',
'-fno-strict-aliasing',
'-Wall',
'-Wno-attributes',
@@
-164,6
+163,9
@@
def configure(conf):
# libsndfile
conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
# libsndfile
conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
+ # libsamplerate
+ conf.check_cfg(package='samplerate', args='--cflags --libs', uselib_store='SAMPLERATE', mandatory=True)
+
# glib
conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
# glib
conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
@@
-180,10
+182,13
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
if graphics is not None:
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK')
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)
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
+ # fontconfig
+ conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
+
# pangomm
conf.check_cfg(package='pangomm-1.4', args='--cflags --libs', uselib_store='PANGOMM', mandatory=True)
# pangomm
conf.check_cfg(package='pangomm-1.4', args='--cflags --libs', uselib_store='PANGOMM', mandatory=True)
@@
-192,10
+197,10
@@
def configure(conf):
# libcxml
if conf.options.static_cxml:
# libcxml
if conf.options.static_cxml:
- conf.check_cfg(package='libcxml', atleast_version='0.
08
', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.
12.0
', args='--cflags', uselib_store='CXML', mandatory=True)
conf.env.STLIB_CXML = ['cxml']
else:
conf.env.STLIB_CXML = ['cxml']
else:
- conf.check_cfg(package='libcxml', atleast_version='0.
08
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.
12.0
', args='--cflags --libs', uselib_store='CXML', mandatory=True)
# libssh
if conf.options.static_ssh:
# libssh
if conf.options.static_ssh:
@@
-217,26
+222,27
@@
def configure(conf):
# libdcp
if conf.options.static_dcp:
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.
1.0
', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.
2.4
', 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-libdcp-1.0', 'kumu-libdcp-1.0']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.
1.0
', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.
2.4
', 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.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.1.
0', args='--cflags', uselib_store='DCP
', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
5', 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.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.1.
0', args='--cflags --libs', uselib_store='DCP
', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.
5', args='--cflags --libs', uselib_store='SUB
', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
if conf.options.static_xmlpp:
conf.env.STLIB_XMLPP = ['xml++-2.6']
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
if conf.options.static_xmlpp:
conf.env.STLIB_XMLPP = ['xml++-2.6']
+ conf.env.LIB_XMLPP = ['xml2']
else:
conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
else:
conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
@@
-277,7
+283,7
@@
def configure(conf):
conf.env['LIB_%s' % name.upper()] = libs
conf.env['STLIB_%s' % name.upper()] = stlibs
conf.env['LIB_%s' % name.upper()] = libs
conf.env['STLIB_%s' % name.upper()] = stlibs
- conf.env['INCLUDE_%s' % name.upper()] = include
+ conf.env['INCLUDE
S
_%s' % name.upper()] = include
conf.env['LIBPATH_%s' % name.upper()] = libpath
else:
conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True)
conf.env['LIBPATH_%s' % name.upper()] = libpath
else:
conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True)
@@
-295,6
+301,7
@@
def configure(conf):
conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
conf.env.STLIB_BOOST_DATETIME = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix]
conf.env.STLIB_BOOST_SIGNALS2 = ['boost_signals2']
conf.env.STLIB_BOOST_SYSTEM = ['boost_system']
+ conf.env.STLIB_BOOST_REGEX = ['boost_regex']
else:
conf.check_cxx(fragment="""
#include <boost/version.hpp>\n
else:
conf.check_cxx(fragment="""
#include <boost/version.hpp>\n
@@
-342,14
+349,22
@@
def configure(conf):
msg='Checking for boost signals2 library',
uselib_store='BOOST_SIGNALS2')
msg='Checking for boost signals2 library',
uselib_store='BOOST_SIGNALS2')
+ conf.check_cxx(fragment="""
+ #include <boost/regex.hpp>\n
+ int main() { boost::regex re ("foo"); }\n
+ """,
+ msg='Checking for boost regex library',
+ lib=['boost_regex%s' % boost_lib_suffix],
+ uselib_store='BOOST_REGEX')
+
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')
-
+
datadir = conf.env.DATADIR
if not datadir:
datadir = os.path.join(conf.env.PREFIX, 'share')
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)
conf.define('LOCALEDIR', os.path.join(datadir, 'locale'))
conf.define('DATADIR', datadir)
@@
-401,10
+416,12
@@
def build(bld):
bld.recurse('platform/osx')
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
bld.recurse('platform/osx')
for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
- bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, '
icon
s/%s/dcpomatic2.png' % r)
+ bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, '
graphic
s/%s/dcpomatic2.png' % r)
if not bld.env.TARGET_WINDOWS:
if not bld.env.TARGET_WINDOWS:
- bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png')
+ 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.add_post_fun(post)
@@
-435,7
+452,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 and os.path.exists('.git_revision'):
f = open('.git_revision', 'r')
commit = f.readline().strip()
-
+
if commit is None:
commit = 'release'
if commit is None:
commit = 'release'
@@
-457,7
+474,7
@@
def create_version_cc(version, cxx_flags):
except IOError:
print('Could not open src/lib/version.cc for writing\n')
sys.exit(-1)
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')
def post(ctx):
if ctx.cmd == 'install':
ctx.exec_command('/sbin/ldconfig')
@@
-478,3
+495,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)
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 .')