Various manual bits.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 1e42377bbc1446a22e7b1ff7c82cbc216b84287a..b6088e0cb671925a32b7bdfd270289dfe6552f9f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -3,11 +3,8 @@ import shutil
 import os
 
 def dependencies(target):
-    if target.platform == 'windows':
-        return ()
-    else:
-        return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'),
-                ('libdcp', 'v0.78'))
+    return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'),
+            ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -27,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)
@@ -61,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):