X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ffbca416880d87703525b4aa4c759b1f5d672c6d;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=b34eb064c5c3ee0892f2bc92e5e15b10bd662212;hpb=254a596bfa5fe29f354f95ef6a051d8015b38a07;p=dcpomatic.git

diff --git a/cscript b/cscript
index b34eb064c..ffbca4168 100644
--- a/cscript
+++ b/cscript
@@ -6,9 +6,10 @@ def dependencies(target):
     if target.platform == 'windows':
         return ()
     else:
-        return (('openjpeg-cdist', None)
-                ('ffmpeg-cdist', 'bf3361f28066820e3d74de8f52bac784663813fa')
-                ('libdcp', 'v0.45'))
+        return (('openjpeg-cdist', None),
+                ('libcxml', None),
+                ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
+                ('libdcp', None))
 
 def build(env, target):
     cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
@@ -28,7 +29,7 @@ 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~%%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)
@@ -42,26 +43,31 @@ def package(env, target, version):
         shutil.copyfile('builds/control-%s-%d' % (target.version, target.bits), 'debian/control')
         env.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)
+        shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
+        env.command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
+        os.chdir('dcpomatic-%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')
-        return os.path.abspath(glob.glob('../*.deb')[0])
+        
+        debs = []
+        for p in glob.glob('../*.deb'):
+            debs.append(os.path.abspath(p))
+
+        return debs
 
 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')]
+    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):
     os.chdir('doc/manual')