projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use -Wno-deprecated-copy on older GCC.
[dcpomatic.git]
/
wscript
diff --git
a/wscript
b/wscript
index 8c3b4548ac39338b7f821483a603f74dbe4fe7f5..eff2b04387a239897bd363ff2f9ea74e5219880c 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-39,6
+39,12
@@
APPNAME = 'dcpomatic'
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]
+# Python 2/3 compatibility; I don't really understand what's going on here
+if not isinstance(this_version, str):
+ this_version = this_version.decode('utf-8')
+if not isinstance(last_version, str):
+ last_version = last_version.decode('utf-8')
+
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else:
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else:
@@
-110,6
+116,8
@@
def configure(conf):
gcc = conf.env['CC_VERSION']
if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
gcc = conf.env['CC_VERSION']
if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+ if int(gcc[0]) >= 9:
+ conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy'])
have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
if conf.options.enable_debug:
have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
if conf.options.enable_debug:
@@
-551,10
+559,9
@@
def configure(conf):
Logs.pprint('YELLOW', '')
def download_supporters(can_fail):
Logs.pprint('YELLOW', '')
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 -m 2 -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
+ r = os.system('curl -m 2 -s -f https://dcpomatic.com/supporters.cc > src/wx/supporters.cc')
if (r >> 8) == 0:
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()})
)
+ r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc
> src/wx/subscribers.cc'
)
if (r >> 8) != 0:
if 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))
@@
-605,7
+612,7
@@
def dist(ctx):
if r is not None:
f = open('.git_revision', 'w')
print(r, file=f)
if r is not None:
f = open('.git_revision', 'w')
print(r, file=f)
- f.close()
+
f.close()
ctx.excl = """
TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git
ctx.excl = """
TODO core *~ src/wx/*~ src/lib/*~ builds/*~ doc/manual/*~ src/tools/*~ *.pyc .waf* build .git