Check for long CCAP lines and too many CCAP lines.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 5b0db9cedef64cdf4ebf157c74f6e301973cb2a2..98ad195736d1604176b914b8211944a5dc1aa19c 100644 (file)
--- a/cscript
+++ b/cscript
@@ -410,18 +410,6 @@ def build(target, options):
                        'sources': [{'type': 'archive',
                                     'url': 'https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2',
                                     'sha256': '5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9'}]})
-       modules.append({'name': 'icu',
-                       'subdir': 'source',
-                       'buildsystem': 'simple',
-                       'build-commands': [
-                           './configure --prefix=/app',
-                           'make -j $(nprocs)',
-                           'make install'
-                       ],
-                       'sources': [{'type': 'archive',
-                                    'url': 'http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz',
-                                    'sha256': '3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3'}],
-                       'cleanup': ['/include', '/lib/*.a', '/lib/*.la', '/lib/pkgconfig']})
        modules.append({'name': 'asdcplib',
                        'buildsystem': 'simple',
                        'build-commands': [
@@ -481,7 +469,7 @@ def build(target, options):
                         },
                        'sources': [{'type': 'dir', 'path': os.path.abspath('.')}]})
         desc = {'app-id': 'com.dcpomatic.DCP-o-matic',
-                'runtime': 'org.gnome.Platform',
+                'runtime': 'org.gnome.Sdk',
                 'runtime-version': '3.26',
                 'sdk': 'org.gnome.Sdk',
                 'command': 'dcpomatic2',
@@ -490,7 +478,7 @@ def build(target, options):
         os.makedirs('build/platform')
         with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
             json.dump(desc, outfile)
-        target.command('flatpak-builder --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json')
+        target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
     else:
         target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
         target.command('./waf')
@@ -583,6 +571,7 @@ def package_rpm(target, cpu, version, options):
     return rpms
 
 def package(target, version, options):
+    """version: DCP-o-matic version string"""
     if target.platform == 'windows':
         return package_windows(target)
     elif target.platform == 'linux':
@@ -614,8 +603,8 @@ def package(target, version, options):
         target.command('docker build build/platform/docker -t dcpomatic-server:%s' % version)
         target.command('docker save dcpomatic-server:%s -o dcpomatic-server-%s-docker.tar' % (version, version))
     elif target.platform == 'flatpak':
-        target.command('flatpak build-bundle build/platform/repo build/dcpomatic.flatpak com.dcpomatic.DCP-o-matic')
-        return os.path.abspath('build/dcpomatic.flatpak')
+        target.command('%s build-bundle build/platform/repo build/dcpomatic_%s.flatpak com.dcpomatic.DCP-o-matic' % (target.flatpak(), version))
+        return os.path.abspath('build/dcpomatic_%s.flatpak' % version)
 
 def make_pot(target):
     target.command('./waf pot')