Remove unused variable.
[dcpomatic.git] / wscript
diff --git a/wscript b/wscript
index e4e0f84b4c90b4ae140e1352cd0b5084327a992b..591a10e5445c6989026cee35183e706d81e03a46 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -17,6 +17,8 @@
 #    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 import subprocess
 import os
 import shlex
@@ -33,11 +35,19 @@ except ImportError:
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
+libdcp_version = '1.8.13'
+libsub_version = '1.6.13'
 
 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 --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), 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 this_version == '':
+if this_version == '' or this_version == 'merged-to-main':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
     VERSION = this_version[1:].strip()
@@ -49,8 +59,9 @@ def options(opt):
     opt.add_option('--enable-debug',      action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
     opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
-    opt.add_option('--install-prefix',                         default=None,  help='prefix of where DCP-o-matic will be installed')
-    opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
+    opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile for Windows 64-bit')
+    opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile for Windows 32-bit')
+    opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64')
     opt.add_option('--static-dcpomatic',  action='store_true', default=False, help='link to components of DCP-o-matic statically')
     opt.add_option('--static-boost',      action='store_true', default=False, help='link statically to Boost')
     opt.add_option('--static-wxwidgets',  action='store_true', default=False, help='link statically to wxWidgets')
@@ -63,76 +74,89 @@ def options(opt):
     opt.add_option('--static-sub',        action='store_true', default=False, help='link statically to libsub')
     opt.add_option('--static-curl',       action='store_true', default=False, help='link statically to libcurl')
     opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
-    opt.add_option('--force-cpp11',       action='store_true', default=False, help='force use of C++11')
-    opt.add_option('--variant',           help='build variant', choices=['swaroop-studio', 'swaroop-theater'])
+    opt.add_option('--use-lld',           action='store_true', default=False, help='use lld linker')
+    opt.add_option('--enable-disk',       action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
+    opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
+    opt.add_option('--wx-config',         help='path to wx-config')
 
 def configure(conf):
     conf.load('compiler_cxx')
     conf.load('clang_compilation_database', tooldir=['waf-tools'])
-    if conf.options.target_windows:
+    if conf.options.target_windows_64 or conf.options.target_windows_32:
         conf.load('winres')
 
     # Save conf.options that we need elsewhere in conf.env
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.DISABLE_TESTS = conf.options.disable_tests
-    conf.env.TARGET_WINDOWS = conf.options.target_windows
+    conf.env.TARGET_WINDOWS_64 = conf.options.target_windows_64
+    conf.env.TARGET_WINDOWS_32 = conf.options.target_windows_32
     conf.env.TARGET_OSX = sys.platform == 'darwin'
-    conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX
+    conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS_64 and not conf.env.TARGET_WINDOWS_32 and not conf.env.TARGET_OSX
     conf.env.VERSION = VERSION
     conf.env.DEBUG = conf.options.enable_debug
     conf.env.STATIC_DCPOMATIC = conf.options.static_dcpomatic
-    if conf.options.install_prefix is None:
-        conf.env.INSTALL_PREFIX = conf.env.PREFIX
+    conf.env.ENABLE_DISK = conf.options.enable_disk
+    if conf.options.destdir == '':
+        conf.env.INSTALL_PREFIX = conf.options.prefix
     else:
-        conf.env.INSTALL_PREFIX = conf.options.install_prefix
+        conf.env.INSTALL_PREFIX = conf.options.destdir
 
     # Common CXXFLAGS
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',
                                        '-D__STDC_LIMIT_MACROS',
                                        '-D__STDC_FORMAT_MACROS',
-                                       '-msse',
                                        '-fno-strict-aliasing',
                                        '-Wall',
-                                       '-Wcast-align',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       # Remove auto_ptr warnings from libxml++-2.6
-                                       '-Wno-deprecated-declarations',
+                                       '-Wno-error=deprecated',
+                                       # I tried and failed to ignore these with _Pragma
                                        '-Wno-ignored-qualifiers',
-                                       '-Wno-parentheses',
-                                       '-D_FILE_OFFSET_BITS=64'])
+                                       '-D_FILE_OFFSET_BITS=64',
+                                       '-std=c++11'])
+
+    if conf.options.warnings_are_errors:
+        conf.env.append_value('CXXFLAGS', '-Werror')
 
-    if conf.options.force_cpp11:
-        conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+    if not conf.options.target_macos_arm64:
+        conf.env.append_value('CXXFLAGS', '-msse')
 
-    gcc = conf.env['CC_VERSION']
-    if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
-        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
-    have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+    if conf.env['CXX_NAME'] == 'gcc':
+        gcc = conf.env['CC_VERSION']
+        if int(gcc[0]) >= 8:
+            # I tried and failed to ignore these with _Pragma
+            conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
+        # Most gccs still give these warnings from boost::optional
+        conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
+        conf.env.append_value('CXXFLAGS', ['-Wsuggest-override'])
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
-    if conf.options.variant is not None:
-        conf.env.VARIANT = conf.options.variant
-        if conf.options.variant.startswith('swaroop-'):
-            conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_SWAROOP')
+    if conf.options.enable_disk:
+        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_DISK')
+
+    if conf.options.use_lld:
+        try:
+            conf.find_program('ld.lld')
+            conf.env.append_value('LINKFLAGS', '-fuse-ld=lld')
+        except conf.errors.ConfigurationError:
+            pass
 
     #
     # Windows/Linux/OS X specific
     #
 
     # Windows
-    if conf.env.TARGET_WINDOWS:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_WINDOWS')
         conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN')
         conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H')
-        conf.env.append_value('CXXFLAGS', '-DUNICODE')
         conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
         conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
-        conf.env.append_value('CXXFLAGS', '-std=c++11')
+        conf.env.append_value('CXXFLAGS', '-Wcast-align')
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug:
@@ -146,8 +170,10 @@ def configure(conf):
         conf.check(lib='dsound', uselib_store='DSOUND', msg="Checking for library dsound")
         conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
         conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
-        boost_lib_suffix = '-mt'
-        boost_thread = 'boost_thread_win32-mt'
+        conf.check(lib='setupapi', uselib_store='SETUPAPI', msg="Checking for library setupapi")
+        conf.check(lib='uuid', uselib_store='UUID', msg="Checking for library uuid")
+        boost_lib_suffix = '-mt-x32' if conf.options.target_windows_32 else '-mt-x64'
+        boost_thread = 'boost_thread' + boost_lib_suffix
         conf.check_cxx(fragment="""
                                #include <boost/locale.hpp>\n
                                int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
@@ -168,19 +194,15 @@ def configure(conf):
     if conf.env.TARGET_LINUX:
         conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
         conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
-        conf.env.append_value('CXXFLAGS', ['-Wlogical-op'])
-        if not conf.env.DISABLE_GUI:
-            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+        conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
+        conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
 
     # OSX
     if conf.env.TARGET_OSX:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
-    else:
-        # Avoid the endless warnings about _t uninitialized in optional<>
-        conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized')
 
     #
     # Dependencies.
@@ -233,6 +255,18 @@ def configure(conf):
                    define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
                    )
 
+    # libbz2; must be explicitly linked on macOS for some reason
+    conf.check_cxx(fragment="""
+                            #include <bzlib.h>
+                            int main() { BZ2_bzCompressInit(0, 0, 0, 0); }
+                            """,
+                   mandatory=True,
+                   msg="Checking for libbz2",
+                   okmsg='yes',
+                   lib='bz2',
+                   uselib_store="BZ2"
+                   )
+
     # fontconfig
     conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
 
@@ -242,46 +276,12 @@ def configure(conf):
     # cairomm
     conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True)
 
-    test_cxxflags = ''
-    if have_c11:
-        test_cxxflags = '-std=c++11'
-
-    # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not
-    conf.check_cxx(fragment="""
-                            #include <cairomm/cairomm.h>
-                            int main(void) {
-                                Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n
-                                return 0; }\n
-                            """,
-                       mandatory=False,
-                       cxxflags=test_cxxflags,
-                       msg='Checking for format_stride_for_width',
-                       okmsg='yes',
-                       includes=conf.env['INCLUDES_CAIROMM'],
-                       uselib='CAIROMM',
-                       define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH')
-
-    # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not
-    conf.check_cxx(fragment="""
-                            #include <pangomm.h>
-                            int main(void) {
-                                Cairo::RefPtr<Cairo::Context> context;
-                                Glib::RefPtr<Pango::Layout> layout;
-                                layout->show_in_cairo_context (context);
-                                return 0; }\n
-                            """,
-                       mandatory=False,
-                       msg='Checking for show_in_cairo_context',
-                       cxxflags=test_cxxflags,
-                       okmsg='yes',
-                       includes=conf.env['INCLUDES_PANGOMM'],
-                       uselib='PANGOMM',
-                       define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT')
-
+    # leqm_nrt
+    conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True)
 
     # libcxml
     if conf.options.static_cxml:
-        conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True)
         conf.env.STLIB_CXML = ['cxml']
     else:
         conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
@@ -292,10 +292,10 @@ def configure(conf):
         if conf.options.workaround_gssapi:
             conf.env.LIB_SSH = ['gssapi_krb5']
     else:
-        conf.check_cc(fragment="""
+        conf.check_cxx(fragment="""
                                #include <libssh/libssh.h>\n
                                int main () {\n
-                               ssh_session s = ssh_new ();\n
+                               ssh_new ();\n
                                return 0;\n
                                }
                                """,
@@ -306,21 +306,21 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version=libdcp_version, 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-cth', 'kumu-cth', 'openjp2']
-        conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2']
+        conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt', 'xerces-c']
     else:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.7', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version=libdcp_version, 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.4.7', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version=libsub_version, 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.4.7', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version=libsub_version, args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++
@@ -345,6 +345,40 @@ def configure(conf):
     # libpng
     conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
 
+    # libjpeg
+    conf.check_cxx(fragment="""
+                            #include <cstddef>
+                            #include <cstdio>
+                            #include <jpeglib.h>
+                            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')
+
+    # lwext4
+    if conf.options.enable_disk:
+        conf.check_cxx(fragment="""
+                                #include <lwext4/ext4.h>\n
+                                int main() { ext4_mount("ext4_fs", "/mp/", false); }\n
+                                """,
+                                msg='Checking for lwext4 library',
+                                libpath='/usr/local/lib',
+                                lib=['lwext4', 'blockdev'],
+                                uselib_store='LWEXT4')
+
+    if conf.env.TARGET_LINUX and conf.options.enable_disk:
+        conf.check_cfg(package='polkit-gobject-1', args='--cflags --libs', uselib_store='POLKIT', mandatory=True)
+
+    # nanomsg
+    if conf.options.enable_disk:
+        if conf.check_cfg(package='nanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=False) is None:
+            conf.check_cfg(package='libnanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=True)
+        if conf.env.TARGET_LINUX:
+            # We link with nanomsg statically on Centos 8 so we need to link this as well
+            conf.env.LIB_NANOMSG.append('anl')
+
     # FFmpeg
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample']
@@ -418,11 +452,31 @@ def configure(conf):
                    define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
                    mandatory=False)
 
+    # See if we have av_register_all and avfilter_register_all
+    conf.check_cxx(fragment="""
+                            extern "C" {\n
+                            #include <libavformat/avformat.h>\n
+                            #include <libavfilter/avfilter.h>\n
+                            }\n
+                            int main () { av_register_all(); avfilter_register_all(); }\n
+                            """,
+                   msg='Checking for av_register_all and avfilter_register_all',
+                   uselib='AVFORMAT AVFILTER',
+                   define_name='DCPOMATIC_HAVE_AVREGISTER',
+                   mandatory=False)
+
     # Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags
     # to these variables.  We don't want to use these for the actual build, so clean them out.
     conf.env['CXXFLAGS_AVCODEC'] = []
     conf.env['CXXFLAGS_AVUTIL'] = []
 
+    if conf.env.TARGET_LINUX:
+        conf.env.LIB_X11 = ['X11']
+
+    # We support older boosts on Linux so we can use the distribution-provided package
+    # on Centos 7, but it's good if we can use 1.61 for boost::dll::program_location()
+    boost_version = ('1.45', '104500') if conf.env.TARGET_LINUX else ('1.61', '106800')
+
     # Boost
     if conf.options.static_boost:
         conf.env.STLIB_BOOST_THREAD = ['boost_thread']
@@ -434,19 +488,19 @@ def configure(conf):
     else:
         conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n
-                            #if BOOST_VERSION < 104500\n
+                            #if BOOST_VERSION < %s\n
                             #error boost too old\n
                             #endif\n
                             int main(void) { return 0; }\n
-                            """,
+                            """ % boost_version[1],
                        mandatory=True,
-                       msg='Checking for boost library >= 1.45',
+                       msg='Checking for boost library >= %s' % boost_version[0],
                        okmsg='yes',
-                       errmsg='too old\nPlease install boost version 1.45 or higher.')
+                       errmsg='too old\nPlease install boost version %s or higher.' % boost_version[0])
 
         conf.check_cxx(fragment="""
                            #include <boost/thread.hpp>\n
-                           int main() { boost::thread t (); }\n
+                           int main() { boost::thread t; }\n
                            """,
                        msg='Checking for boost threading library',
                        libpath='/usr/local/lib',
@@ -486,14 +540,21 @@ def configure(conf):
                        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')
+        # Really just checking for the header here (there's no associated library) but the test
+        # program has to link with boost_system so I'm doing it this way.
+        if conf.options.enable_disk:
+            deps = ['boost_system%s' % boost_lib_suffix]
+            if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
+                deps.append('ws2_32')
+                deps.append('boost_filesystem%s' % boost_lib_suffix)
+            conf.check_cxx(fragment="""
+                                #include <boost/process.hpp>\n
+                                int main() { new boost::process::child("foo"); }\n
+                                """,
+                           cxxflags='-Wno-unused-parameter',
+                           msg='Checking for boost process library',
+                           lib=deps,
+                           uselib_store='BOOST_PROCESS')
 
     # Other stuff
 
@@ -512,7 +573,7 @@ def configure(conf):
         conf.recurse('test')
 
     Logs.pprint('YELLOW', '')
-    if conf.env.TARGET_WINDOWS:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': Windows')
     elif conf.env.TARGET_LINUX:
         Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': Linux')
@@ -540,31 +601,22 @@ def configure(conf):
 
     Logs.pprint('YELLOW', '')
 
-def download_supporters(can_fail):
-    last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
-    r = os.system('curl -m 2 -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
-    if (r >> 8) == 0:
-        r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()}))
-    if (r >> 8) != 0 and can_fail:
-        raise Exception("Could not download supporters lists")
-
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
-    download_supporters(not bld.env.DEBUG)
 
     bld.recurse('src')
     bld.recurse('graphics')
 
     if not bld.env.DISABLE_TESTS:
         bld.recurse('test')
-    if bld.env.TARGET_WINDOWS:
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         bld.recurse('platform/windows')
     if bld.env.TARGET_LINUX:
         bld.recurse('platform/linux')
     if bld.env.TARGET_OSX:
         bld.recurse('platform/osx')
 
-    if not bld.env.TARGET_WINDOWS:
+    if not bld.env.TARGET_WINDOWS_64 and not bld.env.TARGET_WINDOWS_32:
         bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Regular.ttf')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Italic.ttf')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Bold.ttf')
@@ -586,8 +638,8 @@ def dist(ctx):
     r = git_revision()
     if r is not None:
         f = open('.git_revision', 'w')
-        print >>f,r
-    f.close()
+        print(r, file=f)
+        f.close()
 
     ctx.excl = """
                TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git
@@ -626,14 +678,6 @@ def create_version_cc(version, cxx_flags):
 def post(ctx):
     if ctx.cmd == 'install' and ctx.env.TARGET_LINUX:
         ctx.exec_command('/sbin/ldconfig')
-        # I can't find anything which tells me where things have been installed to,
-        # so here's some nasty hacks to guess.
-        debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/dcpomatic2_uuid')
-        prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/dcpomatic2_uuid')
-        if os.path.exists(debian):
-            os.chmod(debian, 0o4755)
-        if os.path.exists(prefix):
-            os.chmod(prefix, 0o4755)
 
 def pot(bld):
     bld.recurse('src')
@@ -641,6 +685,13 @@ def pot(bld):
 def pot_merge(bld):
     bld.recurse('src')
 
+def supporters(bld):
+    r = os.system('curl -m 2 -s -f https://dcpomatic.com/supporters.cc > src/wx/supporters.cc')
+    if (r >> 8) == 0:
+        r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc > src/wx/subscribers.cc')
+    if (r >> 8) != 0:
+        raise Exception("Could not download supporters lists (%d)" % (r >> 8))
+
 def tags(bld):
     os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc')