From adeab682b76138d7a05bab3943af23cd57e2bc57 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 27 Feb 2020 23:50:10 +0100 Subject: Move swaroop playlist editor stuff into its own swaroop_ files. --- src/tools/wscript | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/tools/wscript') diff --git a/src/tools/wscript b/src/tools/wscript index 3b2c0a04c..710f49eeb 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -37,9 +37,9 @@ def build(bld): cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': - cli_tools = [ 'dcpomatic_uuid'] - elif bld.env.VARIANT == "swaroop-studio": - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = ['swaroop_dcpomatic_uuid'] + elif bld.env.VARIANT == 'swaroop-studio': + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'swaroop_dcpomatic_ecinema', 'swaroop_dcpomatic_uuid'] else: cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] @@ -49,16 +49,18 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') if t == 'server_test': obj.install_path = None gui_tools = [] if not bld.env.DISABLE_GUI: if bld.env.VARIANT == 'swaroop-theater': - gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic_player', 'swaroop_dcpomatic_playlist'] + elif bld.env.VARIANT == 'swaroop-studio': + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist'] else: - gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player'] for t in gui_tools: obj = bld(features='cxx cxxprogram') @@ -75,7 +77,7 @@ def build(bld): obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: obj.source += ' ../../platform/windows/%s.rc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) -- cgit v1.2.3