X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=755f300a1eddc847939d24285dfc5ae8c0ef609b;hb=4843bf7b6820fe9f027699cf30c41804e714fbac;hp=ab86865b25cac7c4b5279fccfa2b5b0ab9eb8c00;hpb=2747e0ee0911e00eebd5a81d7dd69fdf0567f3af;p=dcpomatic.git

diff --git a/wscript b/wscript
index ab86865b2..755f300a1 100644
--- a/wscript
+++ b/wscript
@@ -24,10 +24,25 @@ 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'
-VERSION = '2.13.0devel'
+
+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]
+
+if this_version == '':
+    VERSION = '%sdevel' % last_version[1:].strip()
+else:
+    VERSION = this_version[1:].strip()
+
+print('Version: %s' % VERSION)
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -54,6 +69,7 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
+    conf.load('clang_compilation_database', tooldir=['waf-tools'])
     if conf.options.target_windows:
         conf.load('winres')
 
@@ -81,10 +97,9 @@ def configure(conf):
                                        '-Wcast-align',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       '-Wunsafe-loop-optimizations',
-                                       '-Wlogical-op',
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
+                                       '-Wno-ignored-qualifiers',
                                        '-D_FILE_OFFSET_BITS=64'])
 
     if conf.options.force_cpp11:
@@ -150,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', ['-Wlogical-op'])
         if not conf.env.DISABLE_GUI:
             conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
@@ -591,12 +607,15 @@ def configure(conf):
 
     Logs.pprint('YELLOW', '')
 
-def download_supporters():
-    os.system('curl https://dcpomatic.com/supporters.cc > build/supporters.cc')
+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 -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
+    if (r >> 8) != 0 and can_fail:
+        raise Exception("Could not download supporters list")
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
-    download_supporters()
+    download_supporters(not bld.env.DEBUG)
 
     bld.recurse('src')
     bld.recurse('graphics')
@@ -638,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):