diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-23 13:58:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-23 13:58:33 +0100 |
| commit | a332bd6be323f03dad5b180fb237afe54f1bf81e (patch) | |
| tree | 70cf0da21c95941cda478717b15ea71aca4c0bdb /platform | |
| parent | 1c11eaf92c5d592be6df07e2ac77cfcf65e3ed0c (diff) | |
Remove swaroop variant.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux/wscript | 58 | ||||
| -rw-r--r-- | platform/windows/wscript | 6 |
2 files changed, 32 insertions, 32 deletions
diff --git a/platform/linux/wscript b/platform/linux/wscript index dad5778a6..4b6f7f7aa 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -1,42 +1,42 @@ def build(bld): desktops = [] - if bld.env.VARIANT != 'swaroop-theater': - obj = bld(features='subst') - obj.source = 'dcpomatic.desktop.in' - obj.target = 'dcpomatic2.desktop' - obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX - obj.VERSION = bld.env.VERSION - desktops.append(obj.target) - obj = bld(features='subst') - obj.source = 'dcpomatic_batch.desktop.in' - obj.target = 'dcpomatic2_batch.desktop' - obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX - obj.VERSION = bld.env.VERSION - desktops.append(obj.target) + obj = bld(features='subst') + obj.source = 'dcpomatic.desktop.in' + obj.target = 'dcpomatic2.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) - obj = bld(features='subst') - obj.source = 'dcpomatic_server.desktop.in' - obj.target = 'dcpomatic2_server.desktop' - obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX - obj.VERSION = bld.env.VERSION - desktops.append(obj.target) + obj = bld(features='subst') + obj.source = 'dcpomatic_batch.desktop.in' + obj.target = 'dcpomatic2_batch.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) + obj = bld(features='subst') + obj.source = 'dcpomatic_server.desktop.in' + obj.target = 'dcpomatic2_server.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) + + obj = bld(features='subst') + obj.source = 'dcpomatic_kdm.desktop.in' + obj.target = 'dcpomatic2_kdm.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + desktops.append(obj.target) + + if bld.env.ENABLE_DISK: obj = bld(features='subst') - obj.source = 'dcpomatic_kdm.desktop.in' - obj.target = 'dcpomatic2_kdm.desktop' + obj.source = 'dcpomatic_disk.desktop.in' + obj.target = 'dcpomatic2_disk.desktop' obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION desktops.append(obj.target) - if bld.env.ENABLE_DISK: - obj = bld(features='subst') - obj.source = 'dcpomatic_disk.desktop.in' - obj.target = 'dcpomatic2_disk.desktop' - obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX - obj.VERSION = bld.env.VERSION - desktops.append(obj.target) - obj = bld(features='subst') obj.source = 'dcpomatic_player.desktop.in' obj.target = 'dcpomatic2_player.desktop' diff --git a/platform/windows/wscript b/platform/windows/wscript index 2d0c464ec..47044c8dd 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -1,7 +1,7 @@ from __future__ import print_function import os -def write_installer(bits, dcpomatic_version, debug, variant, disk): +def write_installer(bits, dcpomatic_version, debug, disk): tools = [ ('batch', 'Batch Converter'), @@ -471,5 +471,5 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\U def build(bld): - write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) - write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.VARIANT, bld.env.ENABLE_DISK) + write_installer(32, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK) + write_installer(64, bld.env.VERSION, bld.env.DEBUG, bld.env.ENABLE_DISK) |