X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=875b590d129869b08436cdf3493a911c56c924e9;hb=3c3f14a8eeb5505c1920ad3fd235ba6ce3805d24;hp=cad0f9401ae60dfed979e98da9e6f527815e4552;hpb=695c3dfcf2f636c3db694c4ab6fb000bb4665b26;p=dcpomatic.git diff --git a/cscript b/cscript index cad0f9401..875b590d1 100644 --- a/cscript +++ b/cscript @@ -3,8 +3,8 @@ import shutil import os def dependencies(target): - return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'), - ('libdcp', 'f45c39be13bae47936d8b87be45df55741b5bb9c')) + return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), + ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d')) 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')]