Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index f372551168b06d752415511f54bd7b60dd4642f3..1e42377bbc1446a22e7b1ff7c82cbc216b84287a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -6,9 +6,8 @@ def dependencies(target):
     if target.platform == 'windows':
         return ()
     else:
-       # XXX: should be some versions in here
-        return (('ffmpeg-cdist', ''),
-                ('libdcp', None))
+        return (('ffmpeg-cdist', '61d7015f7c79f97e9af00bacedc856e195538a44'),
+                ('libdcp', 'v0.78'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -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')