From f9fe318f3c79e2fc244de56bf6fe0dc1c05fd252 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Oct 2019 22:08:02 +0200 Subject: [PATCH] Allow debug builds with no internet connection. Also add missing patron. --- src/wx/about_dialog.cc | 5 +++++ wscript | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 9e790dacb..0ac5d484f 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -141,6 +141,11 @@ AboutDialog::AboutDialog (wxWindow* parent) translated_by.Add (wxT ("Gökhan Aksoy")); add_section (_("Translated by"), translated_by); + wxArrayString patrons; + patrons.Add ("Luproduction"); + patrons.Add ("Lightbender Post"); + add_section (_("Patrons"), patrons); + wxArrayString subscribers; #include "subscribers.cc" add_section (_("Subscribers"), subscribers); diff --git a/wscript b/wscript index 70a7c5939..c653369ec 100644 --- a/wscript +++ b/wscript @@ -17,6 +17,8 @@ # along with DCP-o-matic. If not, see . # +from __future__ import print_function + import subprocess import os import shlex @@ -544,8 +546,16 @@ def download_supporters(can_fail): r = os.system('curl -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") + 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) -- 2.30.2