X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=a5742eb7b5170f32c6fa4bdb71777a7c42ede32e;hb=a983627b357e25478a524a20cafa4a68a4b9299f;hp=af711af059c24541f2407dba34c60eed8ac7fb62;hpb=c41354136dca03dcfa7318b75a744bf9b3176a09;p=dcpomatic.git

diff --git a/wscript b/wscript
index af711af05..a5742eb7b 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.10devel'
+VERSION = '2.1.37devel'
 
 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)
 
@@ -217,21 +217,21 @@ def configure(conf):
 
     # 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.0', 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.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.0', 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.1.0', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', 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.1.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++
@@ -295,6 +295,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_REGEX = ['boost_regex']
     else:
         conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n
@@ -342,14 +343,22 @@ def configure(conf):
                        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')
-    
+
     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)
 
@@ -401,10 +410,10 @@ def build(bld):
         bld.recurse('platform/osx')
 
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r)
+        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', 'icons/taskbar_icon.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf')
 
     bld.add_post_fun(post)
@@ -436,7 +445,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 +467,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 +488,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 .')