X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=c51f3a033fb3aa22e54cc998e52e85da62858291;hb=a183c1776cfd020a37d028ebb0f641352f49697b;hp=92157a5813d4a9a122870146aabcc413f3830e91;hpb=cd4a82d90677cec80e891ac190000cb70767446f;p=dcpomatic.git

diff --git a/cscript b/cscript
index 92157a581..c51f3a033 100644
--- a/cscript
+++ b/cscript
@@ -8,39 +8,39 @@ def dependencies(target):
     else:
         return (('openjpeg-cdist', None),
                 ('libcxml', None),
-                ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'),
-                ('libdcp', 'v0.45'))
+                ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
+                ('libdcp', None))
 
 def build(env, target):
     cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
     if target.platform == 'windows':
         cmd += ' --target-windows'
-    else:
+    elif target.platform == 'linux':
         cmd += ' --static'
     env.command(cmd)
 
     env.command('./waf')
 
-    if target.platform == 'linux':
+    if target.platform == 'linux' or target.platform == 'osx':
         env.command('./waf install')
 
 
 def package(env, target, version):
     if target.platform == 'windows':
-        shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits)
-        env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits))
-        env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits)
-        env.command('makensis build/windows/installer2.%s.nsi' % target.bits)
-        return os.path.abspath(glob.glob('build/windows/*%s*.exe' % target.bits)[0])
+        shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
+        env.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+        env.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits))
+        env.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+        env.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits)
+        env.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits)
+        return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0])
     elif target.platform == 'linux':
         if target.bits == 32:
             cpu = 'i386'
         else:
             cpu = 'amd64'
 
-        shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control')
+        shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control')
         env.command('./waf dist')
         f = open('debian/files', 'w')
         print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
@@ -62,6 +62,9 @@ def package(env, target, version):
             debs.append(os.path.abspath(p))
 
         return debs
+    elif target.platform == 'osx':
+        env.command('bash platform/osx/make_dmg.sh')
+        return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0])
 
 def make_pot(env):
     env.command('./waf pot')