projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[dcpomatic.git]
/
cscript
diff --git
a/cscript
b/cscript
index 3c3aeb4ed85f067674befc66a0c3798e6fb65b2f..43a9b0832b728c3a0d2475d6b9f0d070a2ec3c24 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-236,9
+236,9
@@
def dependencies(target):
else:
ffmpeg_options = {}
else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '
aab2fb1
', ffmpeg_options),
- ('libdcp', 'a
5bf0e4
'),
- ('libsub', '
3e299e5
'))
+ return (('ffmpeg-cdist', '
1d4a1a4
', ffmpeg_options),
+ ('libdcp', 'a
c6df08
'),
+ ('libsub', '
067c21c
'))
def configure_options(target):
opt = ''
def configure_options(target):
opt = ''
@@
-337,7
+337,10
@@
def package_rpm(target, cpu, version):
if cpu == "amd64":
cpu = "x86_64"
else:
if cpu == "amd64":
cpu = "x86_64"
else:
- cpu = "i686"
+ if target.distro == 'centos' and target.version == '5':
+ cpu = "i386"
+ else:
+ cpu = "i686"
print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
@@
-378,7
+381,9
@@
def make_manual(target):
def test(target, test):
if target.platform != 'windows':
target.set('LC_ALL', 'C')
def test(target, test):
if target.platform != 'windows':
target.set('LC_ALL', 'C')
- if test is None:
- target.command('run/tests')
- else:
- target.command('run/tests --run_test=%s' % test)
+ cmd = 'run/tests '
+ if target.debug:
+ cmd += '--backtrace '
+ if test is not None:
+ cmd += '--run_test=%s' % test
+ target.command(cmd)