diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-10 20:16:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-10 20:16:46 +0200 |
| commit | 8775f802d15e19ff9251d0daff49994a0fc145bc (patch) | |
| tree | 5179f01dcfb27ea3427386f392fc302aa84358a7 | |
| parent | cde792116ecae3d61f9b724fc581fdf82f30a0a9 (diff) | |
| parent | c0a609b31bbf69d1fafcc734ac4f825933703d23 (diff) | |
Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | wscript | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 8f31cd557..0ac5d484f 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -143,6 +143,7 @@ AboutDialog::AboutDialog (wxWindow* parent) wxArrayString patrons; patrons.Add ("Luproduction"); + patrons.Add ("Lightbender Post"); add_section (_("Patrons"), patrons); wxArrayString subscribers; @@ -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) |