X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=e4f9859b90a396f9804d47de66e339525ca22f38;hb=9a5b74a15a21e4563db6fb083313d0160eb4a12a;hp=a65a92702d3ab6aabb5a7d839964e11fe5ff2d83;hpb=50ce388189f9c930ea0ba80cfb20237cfa464a3f;p=dcpomatic.git

diff --git a/cscript b/cscript
index a65a92702..e4f9859b9 100644
--- a/cscript
+++ b/cscript
@@ -3,12 +3,8 @@ import shutil
 import os
 
 def dependencies(target):
-    if target.platform == 'windows':
-        return ()
-    else:
-	# XXX: should be some versions in here
-        return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'),
-                ('libdcp', 'v0.54'))
+    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
+            ('libdcp', '2ee05f7ecc1847f1840610090ef3c093cf4a6554'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -28,7 +24,8 @@ def package(target, version):
     if target.platform == 'windows':
         shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        target.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.work_dir_cscript(), target.bits))
         target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
         target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits)
@@ -62,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):
@@ -74,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')]