Cleanup: missing word in comment.
[dcpomatic.git] / wscript
diff --git a/wscript b/wscript
index 19fd4260c2c6c9a6a7598d8ff2c54e64500c82e6..0fae054bfb3135d8af08fba218616f533873b6bb 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,20 +35,20 @@ except ImportError:
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-libdcp_version = '1.8.73'
+libdcp_version = '1.8.100'
 libsub_version = '1.6.42'
 
-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 --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
+git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], 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 not isinstance(git_head, str):
+    git_head = git_head.decode('utf-8')
 
-if this_version == '' or this_version == 'merged-to-main':
-    VERSION = '%sdevel' % last_version[1:].strip()
+if this_version == '':
+    VERSION = git_head.strip()
 else:
     VERSION = this_version[1:].strip()
 
@@ -81,6 +81,7 @@ def options(opt):
     opt.add_option('--enable-asan',       action='store_true', help='build with asan')
     opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch')
     opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0')
+    opt.add_option('--variant', help="build with variant")
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -115,6 +116,7 @@ def configure(conf):
         conf.env.INSTALL_PREFIX = conf.options.prefix
     else:
         conf.env.INSTALL_PREFIX = conf.options.destdir
+    conf.env.VARIANT = conf.options.variant if conf.options.variant else "dcpomatic"
 
     conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE')
 
@@ -217,7 +219,6 @@ def configure(conf):
                                int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
                                """,
                                msg='Checking for boost locale library',
-                               libpath='/usr/local/lib',
                                lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                                uselib_store='BOOST_LOCALE')
 
@@ -240,7 +241,6 @@ def configure(conf):
     if conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
-        conf.env.append_value('LINKFLAGS', '-llzma')
 
     #
     # Dependencies.
@@ -251,6 +251,16 @@ def configure(conf):
     # linked and others that should be dynamic.  This doesn't work too well with waf
     # as it wants them separate.
 
+    def check_via_pkg_config(conf, package, uselib_store, mandatory, static, minimum_version):
+        args = package if minimum_version is None else '%s >= %s' % (package, minimum_version)
+        args += ' --cflags'
+        if not static:
+            args += ' --libs'
+        msg = 'Checking for %s' % package
+        if minimum_version is not None:
+            msg += ' >= %s' % minimum_version
+        conf.check_cfg(package=package, args=args, uselib_store=uselib_store, mandatory=mandatory, msg=msg)
+
     # libcurl
     if conf.options.static_curl:
         conf.env.STLIB_CURL = ['curl']
@@ -271,7 +281,7 @@ def configure(conf):
                        mandatory=True,
                        msg='Checking for libicu',
                        okmsg='yes',
-                       libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'],
+                       libpath=['/usr/lib', '/usr/lib/x86_64-linux-gnu'],
                        lib=['icuio', 'icui18n', 'icudata', 'icuuc'],
                        uselib_store='ICU')
 
@@ -374,12 +384,12 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags' % libdcp_version, uselib_store='DCP', mandatory=True)
+        check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=True, minimum_version=libdcp_version)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-dcpomatic', 'kumu-dcpomatic', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
-        conf.check_cfg(package='libdcp-1.0', args='libdcp-1.0 >= %s --cflags --libs' % libdcp_version, uselib_store='DCP', mandatory=True)
+        check_via_pkg_config(conf, 'libdcp-1.0', 'DCP', mandatory=True, static=False, minimum_version=libdcp_version)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
 
     # libsub
@@ -421,7 +431,6 @@ def configure(conf):
                             int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
                             """,
                    msg='Checking for libjpeg',
-                   libpath='/usr/local/lib',
                    lib=['jpeg'],
                    uselib_store='JPEG')
 
@@ -432,7 +441,6 @@ def configure(conf):
                                 int main() { ext4_mount("ext4_fs", "/mp/", false); }\n
                                 """,
                                 msg='Checking for lwext4 library',
-                                libpath='/usr/local/lib',
                                 lib=['lwext4', 'blockdev'],
                                 uselib_store='LWEXT4')
 
@@ -571,7 +579,6 @@ def configure(conf):
                            int main() { boost::thread t; }\n
                            """,
                        msg='Checking for boost threading library',
-                       libpath='/usr/local/lib',
                        lib=[boost_thread, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_THREAD')
 
@@ -580,7 +587,6 @@ def configure(conf):
                            int main() { boost::filesystem::copy_file ("a", "b"); }\n
                            """,
                        msg='Checking for boost filesystem library',
-                       libpath='/usr/local/lib',
                        lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_FILESYSTEM')
 
@@ -589,7 +595,6 @@ def configure(conf):
                            int main() { boost::gregorian::day_clock::local_day(); }\n
                            """,
                        msg='Checking for boost datetime library',
-                       libpath='/usr/local/lib',
                        lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_DATETIME')
 
@@ -624,6 +629,18 @@ def configure(conf):
                            lib=deps,
                            uselib_store='BOOST_PROCESS')
 
+    # sqlite3
+    conf.check_cfg(package="sqlite3", args='--cflags --libs', uselib_store='SQLITE3', mandatory=True)
+    conf.check_cxx(fragment="""
+                       #include <sqlite3.h>
+                       int main() { sqlite3_prepare_v3(nullptr, "", -1, 0, nullptr, nullptr); }
+                       """,
+                   msg='Checking for sqlite3_prepare_v3',
+                   uselib='SQLITE3',
+                   define_name="DCPOMATIC_HAVE_SQLITE3_PREPARE_V3",
+                   mandatory=False)
+
+
     # Other stuff
 
     conf.find_program('msgfmt', var='MSGFMT')