Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 4fc23bcb597c4c9ef40df1b1fc2fc83d5a1777f3..896b68ab237d1b6f7613f2b3ffdd107a45ec66af 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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
@@ -93,7 +95,6 @@ def configure(conf):
                                        '-msse',
                                        '-fno-strict-aliasing',
                                        '-Wall',
-                                       '-Wcast-align',
                                        '-Wextra',
                                        '-Wwrite-strings',
                                        # Remove auto_ptr warnings from libxml++-2.6
@@ -133,6 +134,7 @@ def configure(conf):
         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:
@@ -170,7 +172,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'])
+        conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
         if not conf.env.DISABLE_GUI:
             conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
@@ -545,8 +547,16 @@ def download_supporters(can_fail):
     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 (%d)" % (r >> 8))
+    if (r >> 8) != 0:
+        if can_fail:
+            raise Exception("Could not download supporters lists (%d)" % (r >> 8))
+        else:
+            f = open('src/wx/supporters.cc', 'w')
+            print('supported_by.Add(wxT("Debug build - no supporters lists available"));', file=f)
+            f.close()
+            f = open('src/wx/subscribers.cc', 'w')
+            print('subscribers.Add(wxT("Debug build - no subscribers lists available"));', file=f)
+            f.close()
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
@@ -586,7 +596,7 @@ def dist(ctx):
     r = git_revision()
     if r is not None:
         f = open('.git_revision', 'w')
-        print >>f,r
+        print(r, file=f)
     f.close()
 
     ctx.excl = """