Add console to dcpomatic_kdm on Windows. Tweak layout a bit more.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index b6e2a09f5d16e85ed721721649b26b16be2875b1..b46a024bb6cbff1631d4d4513d403c71a9f192c8 100644 (file)
--- a/cscript
+++ b/cscript
@@ -207,15 +207,22 @@ def make_spec(filename, version, target):
     print >>f,'%{_bindir}/dcpomatic2_kdm'
     print >>f,'%{_bindir}/dcpomatic2_server'
     print >>f,'%{_bindir}/dcpomatic2_server_cli'
+    print >>f,'%{_bindir}/dcpomatic2_kdm_cli'
     print >>f,'%{_datadir}/applications/dcpomatic2.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop'
     print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
-    print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png'
+    print >>f,'%{_datadir}/applications/dcpomatic2_kdm.desktop'
+    print >>f,'%{_datadir}/dcpomatic2/dcpomatic2_server_small.png'
     print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf'
     print >>f,'%{_datadir}/dcpomatic2/splash.png'
-    for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
+    for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
+        print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@ -251,9 +258,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
-            ('libdcp', 'b3adb83'),
-            ('libsub', 'e959731'))
+    return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+            ('libdcp', 'c7cbd39'),
+            ('libsub', '72d5eb7'))
 
 def configure_options(target):
     opt = ''
@@ -324,7 +331,7 @@ def package_debian(target, cpu, version):
 
     return debs
 
-def package_centos(target, cpu, version):
+def package_rpm(target, cpu, version):
     topdir = os.path.realpath('build/rpmbuild')
     os.makedirs('%s/BUILD' % topdir)
     os.makedirs('%s/RPMS' % topdir)
@@ -347,7 +354,9 @@ def package_centos(target, cpu, version):
     else:
         cpu = "i686"
 
+    print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
+        print 'found %s' % p
         rpms.append(os.path.abspath(p))
 
     return rpms
@@ -363,8 +372,8 @@ def package(target, version):
 
        if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
-        elif target.distro == 'centos':
-            return package_centos(target, cpu, version)
+        elif target.distro == 'centos' or target.distro == 'fedora':
+            return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
         return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])