Add subscribers in their own part of the about box.

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 2461e7bbb990b8bea4cbf868660b9dd1bf2f5c6c..1a4513a74106becf30014945f2c7a0ec98fda505 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -137,9 +137,13 @@ AboutDialog::AboutDialog (wxWindow* parent)
        with_help_from.Add (wxT ("Julian van Mil"));
        add_section (_("With help from"), with_help_from);
 
+       wxArrayString subscribers;
+       #include "subscribers.cc"
+       add_section (_("Subscribers"), subscribers);
+
        wxArrayString supported_by;
        #include "supporters.cc"
-       add_section (_("Supported by"), supported_by);
+       add_section (_("Also supported by"), supported_by);
 
        wxArrayString tested_by;
        tested_by.Add (wxT ("Manuel AC"));

diff --git a/wscript b/wscript
index 755f300a1eddc847939d24285dfc5ae8c0ef609b..27f06f8a1ef33ffeb8b3992c0c42132824e4c0ce 100644 (file)
--- a/wscript
+++ b/wscript
@@ -609,9 +609,11 @@ def configure(conf):
 
 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()}))
+    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 list")
+        raise Exception("Could not download supporters lists")
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)