X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e4f9859b90a396f9804d47de66e339525ca22f38;hb=9a5b74a15a21e4563db6fb083313d0160eb4a12a;hp=644adff075bc2cd25f1e0f50c3e392d1729dd3e2;hpb=055533569bbe84f4adfe19283093189b0a7d9448;p=dcpomatic.git diff --git a/cscript b/cscript index 644adff07..e4f9859b9 100644 --- a/cscript +++ b/cscript @@ -3,8 +3,8 @@ import shutil import os def dependencies(target): - return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'), - ('libdcp', 'v0.81')) + return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), + ('libdcp', '2ee05f7ecc1847f1840610090ef3c093cf4a6554')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() @@ -59,7 +59,7 @@ def package(target, version): return debs elif target.platform == 'osx': - target.command('bash platform/osx/make_dmg.sh') + target.command('bash platform/osx/make_dmg.sh %s' % target.work_dir_cscript()) return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0]) def make_pot(target): @@ -71,4 +71,5 @@ def make_pot(target): def make_manual(target): os.chdir('doc/manual') target.command('make') - return [os.path.abspath('pdf'), os.path.abspath('html')] + target.command('pdflatex colour.tex') + return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]