More renaming.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 620be61e3fe92816d3e482de378778f05c776133..c8a04923440e72606a539a23ffd46d08713cda08 100644 (file)
--- a/wscript
+++ b/wscript
@@ -24,6 +24,12 @@ import sys
 import glob
 import distutils
 import distutils.spawn
+try:
+    # python 2
+    from urllib import urlencode
+except ImportError:
+    # python 3
+    from urllib.parse import urlencode
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
@@ -34,7 +40,7 @@ last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), s
 if this_version == '':
     VERSION = '%sdevel' % last_version[1:].strip()
 else:
-VERSION = '2.13.2devel'
+    VERSION = this_version[1:].strip()
 
 print('Version: %s' % VERSION)
 
@@ -93,6 +99,7 @@ def configure(conf):
                                        '-Wwrite-strings',
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
+                                       '-Wno-ignored-qualifiers',
                                        '-D_FILE_OFFSET_BITS=64'])
 
     if conf.options.force_cpp11:
@@ -148,7 +155,6 @@ def configure(conf):
     # POSIX
     if conf.env.TARGET_LINUX or conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
-        conf.env.append_value('CXXFLAGS', ['-Wunsafe-loop-optimizations', '-Wlogical-op'])
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
@@ -159,6 +165,7 @@ def configure(conf):
         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', '-DDCPOMATIC_LINUX')
+        conf.env.append_value('CXXFLAGS', ['-Wunsafe-loop-optimizations', '-Wlogical-op'])
         if not conf.env.DISABLE_GUI:
             conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
@@ -601,7 +608,10 @@ def configure(conf):
     Logs.pprint('YELLOW', '')
 
 def download_supporters():
-    os.system('curl https://dcpomatic.com/supporters.cc > build/supporters.cc')
+    last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
+    r = os.system('curl -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
+    if (r >> 8) != 0:
+        raise Exception("Could not download supporters list")
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
@@ -647,7 +657,7 @@ def dist(ctx):
     ctx.excl = """
                TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git
                deps alignment hacks sync *.tar.bz2 *.exe .lock* *build-windows doc/manual/pdf doc/manual/html
-               GRSYMS GRTAGS GSYMS GTAGS
+               GRSYMS GRTAGS GSYMS GTAGS compile_commands.json
                """
 
 def create_version_cc(version, cxx_flags):