X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f3966330b321e851a3271abc0742544f9e9482a4;hb=d761439a7a8a3d6f78232a426bf1e54dff55f229;hp=c3f111f8e1082f5a6dc023286b7eed9fdc5cd148;hpb=ccaebd9fdcf308f03e0286a6042630fcb0bcc68f;p=dcpomatic.git

diff --git a/cscript b/cscript
index c3f111f8e..f3966330b 100644
--- a/cscript
+++ b/cscript
@@ -6,8 +6,7 @@ def dependencies(target):
     if target.platform == 'windows':
         return ()
     else:
-	# XXX: should be some versions in here
-        return (('ffmpeg-cdist', None),
+        return (('ffmpeg-cdist', 'e797834288eaf05a2f406524ae04aaa0f114cb08'),
                 ('libdcp', None))
 
 def build(target):
@@ -42,14 +41,14 @@ def package(target, version):
         shutil.copyfile('platform/linux/control-%s-%d' % (target.version, target.bits), 'debian/control')
         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)
-        target.command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
-        os.chdir('dvdomatic-%s' % version)
+        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'))
@@ -63,13 +62,13 @@ def package(target, version):
         return debs
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh')
-        return os.path.abspath(glob.glob('build/platform/osx/DVD-o-matic*.dmg')[0])
+        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
 
 def make_pot(target):
     target.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')]
+    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(target):
     os.chdir('doc/manual')