summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-15 22:40:02 +0100
committerCarl Hetherington <cth@carlh.net>2018-04-15 22:40:02 +0100
commit17625b7ef437ace769f4204df55a7930b9bd9e28 (patch)
treecf373fb575437a1c7b0ba446766e9c3b88132703
parent90a31686bce2aae372fe7bfcf88d1d36e60e3f3e (diff)
about_dialog.cc doesn't always rebuild if supporters.cc changes;
hack around this. Also make supporters lists right for older versions.
-rw-r--r--src/wx/about_dialog.cc2
-rw-r--r--wscript4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d34c351fe..f107c872a 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -137,7 +137,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
add_section (_("With help from"), with_help_from);
wxArrayString supported_by;
- #include "../../build/supporters.cc"
+ #include "supporters.cc"
add_section (_("Supported by"), supported_by);
wxArrayString tested_by;
diff --git a/wscript b/wscript
index 638f8f2fa..62bbb1413 100644
--- a/wscript
+++ b/wscript
@@ -24,6 +24,7 @@ import sys
import glob
import distutils
import distutils.spawn
+import urllib
from waflib import Logs, Context
APPNAME = 'dcpomatic'
@@ -601,7 +602,8 @@ def configure(conf):
Logs.pprint('YELLOW', '')
def download_supporters():
- os.system('curl https://dcpomatic.com/supporters.cc > build/supporters.cc')
+ last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
+ os.system('curl https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urllib.urlencode({"until": last_date.strip()}))
def build(bld):
create_version_cc(VERSION, bld.env.CXXFLAGS)