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 dd0bb9daafba55424fcfa90c995dcbff3f393ef0..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
@@ -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 = """