X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=875b590d129869b08436cdf3493a911c56c924e9;hb=3c3f14a8eeb5505c1920ad3fd235ba6ce3805d24;hp=4ba4eadb918b6c9ab512c98e9a9583b4a78cd8ca;hpb=e36c24bf1522593976de7de2c4d79c76f0ba36a8;p=dcpomatic.git

diff --git a/cscript b/cscript
index 4ba4eadb9..875b590d1 100644
--- a/cscript
+++ b/cscript
@@ -3,35 +3,32 @@ import shutil
 import os
 
 def dependencies(target):
-    if target.platform == 'windows':
-        return ()
-    else:
-        return (('openjpeg-cdist', None),
-                ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
-                ('libdcp', 'v0.53'))
+    return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'),
+            ('libdcp', '658695856029c7ae80e3556d07a1a5cb1b51cf1d'))
 
-def build(env, target):
-    cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
+def build(target):
+    cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
     if target.platform == 'windows':
         cmd += ' --target-windows'
     elif target.platform == 'linux':
         cmd += ' --static'
-    env.command(cmd)
+    target.command(cmd)
 
-    env.command('./waf')
+    target.command('./waf')
 
     if target.platform == 'linux' or target.platform == 'osx':
-        env.command('./waf install')
+        target.command('./waf install')
 
 
-def package(env, target, version):
+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)
-        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)
+        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~%%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)
         return os.path.abspath(glob.glob('build/platform/windows/*%s*.exe' % target.bits)[0])
     elif target.platform == 'linux':
         if target.bits == 32:
@@ -40,21 +37,21 @@ def package(env, target, version):
             cpu = 'amd64'
 
         shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control')
-        env.command('./waf dist')
+        target.command('./waf dist')
         f = open('debian/files', 'w')
-        print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
+        print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
         shutil.rmtree('build/deb', ignore_errors=True)
 
         os.makedirs('build/deb')
         os.chdir('build/deb')
-        shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version)
-        env.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
-        os.chdir('dvdomatic-%s' % version)
-        env.command('dch -b -v %s-1 "New upstream release."' % version)
-        env.set('CDIST_LINKFLAGS', env.get('LINKFLAGS'))
-        env.set('CDIST_CXXFLAGS', env.get('CXXFLAGS'))
-        env.set('CDIST_PKG_CONFIG_PATH', env.get('PKG_CONFIG_PATH'))
-        env.command('dpkg-buildpackage')
+        shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
+        target.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
+        os.chdir('dcpomatic-%s' % version)
+        target.command('dch -b -v %s-1 "New upstream release."' % version)
+        target.set('CDIST_LINKFLAGS', target.get('LINKFLAGS'))
+        target.set('CDIST_CXXFLAGS', target.get('CXXFLAGS'))
+        target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
+        target.command('dpkg-buildpackage')
         
         debs = []
         for p in glob.glob('../*.deb'):
@@ -62,16 +59,17 @@ def package(env, target, version):
 
         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])
+        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(env):
-    env.command('./waf pot')
-    return [os.path.abspath('build/src/lib/libdvdomatic.pot'),
-            os.path.abspath('build/src/wx/libdvdomatic-wx.pot'),
-	    os.path.abspath('build/src/tools/dvdomatic.pot')]
+def make_pot(target):
+    target.command('./waf pot')
+    return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
+            os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
+	    os.path.abspath('build/src/tools/dcpomatic.pot')]
 
-def make_manual(env):
+def make_manual(target):
     os.chdir('doc/manual')
-    env.command('make')
-    return [os.path.abspath('pdf'), os.path.abspath('html')]
+    target.command('make')
+    target.command('pdflatex colour.tex')
+    return [os.path.abspath('pdf'), os.path.abspath('html'), os.path.abspath('colour.pdf')]