Try to fix swaroop-studio build on RPM distros.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 428fddcab61b036a0cd960f796e498e6c17f1935..992a3e9c47d30e0f4d33de0f22401dbc6c67e318 100644 (file)
--- a/cscript
+++ b/cscript
@@ -278,6 +278,9 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
     print('%{_bindir}/dcpomatic2_player', file=f)
     print('%{_bindir}/dcpomatic2_playlist', file=f)
+    if options['variant'] == 'swaroop-studio':
+        print('%{_bindir}/dcpomatic2_ecinema', file=f)
+        print('%{_bindir}/dcpomatic2_uuid', file=f)
     print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
@@ -292,6 +295,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
     print('%{_datadir}/dcpomatic2/tick.png', file=f)
     print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
+    print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
@@ -304,7 +308,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
-              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR', 'ko_KR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -345,14 +349,14 @@ def dependencies(target):
     if target.platform == 'windows' and target.version == 'xp':
         deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
     elif target.platform != 'linux' or target.distro != 'arch':
-        deps = [('ffmpeg-cdist', 'a820b44', ffmpeg_options)]
+        deps = [('ffmpeg-cdist', '20d3ddf', ffmpeg_options)]
     else:
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.6'))
-    deps.append(('libsub', 'v1.4.6'))
-    deps.append(('rtaudio-cdist', 'aad62d7'))
+    deps.append(('libdcp', None))
+    deps.append(('libsub', None))
+    deps.append(('rtaudio-cdist', None))
 
     return deps
 
@@ -527,7 +531,7 @@ def package_windows(target):
     target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier))
     target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier))
-    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier))
+    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier))
     target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier))
     target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier)
     target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier)
@@ -553,10 +557,6 @@ def package_debian(target, cpu, version, options):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version in ['7', '14.04']:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')
-    else:
-        target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
 
     target.command('dpkg-buildpackage -uc -us')