Auto-detect OS X during configure. Try again to fix lzma dep.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d004edac0ec6fa771a3644f011471edcf46d3f89..4ba4eadb918b6c9ab512c98e9a9583b4a78cd8ca 100644 (file)
--- a/cscript
+++ b/cscript
@@ -8,26 +8,26 @@ def dependencies(target):
     else:
         return (('openjpeg-cdist', None),
                 ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
-                ('libdcp', 'v0.49'))
+                ('libdcp', 'v0.53'))
 
 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/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
-        env.command('sed -i "s~%%resources%%~%s/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), 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)
@@ -61,6 +61,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')