projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5864c8f
)
Fix string decoding; bump libcxml version.
v1.6.3
author
Carl Hetherington
<cth@carlh.net>
Tue, 12 Mar 2019 00:35:15 +0000
(
00:35
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 12 Mar 2019 00:35:15 +0000
(
00:35
+0000)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index d4903e3f4e0060e40d397d95837ad6d7b15b63a8..8d780305f20e161dec1e8a6bf4f6855b9ef7e171 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-36,9
+36,9
@@
import shutil
def dependencies(target, options):
if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
def dependencies(target, options):
if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
- return (('libcxml', 'v0.16.
0
'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', '6648afc'))
+ return (('libcxml', 'v0.16.
1
'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', '6648afc'))
else:
else:
- return (('libcxml', 'v0.16.
0
'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
+ return (('libcxml', 'v0.16.
1
'), ('openjpeg2-cdist', '8b2ffc5'), ('asdcplib-cth', '6648afc'))
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
def build(target, options):
cmd = './waf configure --disable-examples --prefix=%s' % target.directory
diff --git
a/wscript
b/wscript
index 54adf00ab0280fb3fa09b069f753bbfec5ff54f7..743a0e8e327d4fb4c680f031bc7cd9a14a9eb827 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-43,11
+43,6
@@
APPNAME = 'libdcp'
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]
-if isinstance(this_version, bytes):
- this_version = this_version.decode('UTF-8')
-if isinstance(last_version, bytes):
- 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: