From 21a6c20e9a85ddef7ad2b92d474428445bf8083e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 10 Apr 2014 07:31:26 -0400 Subject: [PATCH] always build all per-program menu files so that we can try them out with different builds --- gtk2_ardour/wscript | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 326ee143f8..bda61e0eba 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -664,23 +664,30 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] + # always build all versions of the menu definitions + # so that we can try them out with different program builds. + for program in [ 'ardour', 'trx' ]: + obj = bld(features = 'command-output') + obj.command = 'cpp' + obj.command_is_external = True + obj.no_inputs = True + obj.argv = menus_argv + obj.dep_vars = ['GTKOSX'] + obj.stdin = program + '.menus.in' + obj.stdout = program + '.menus' + bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), + program + '.menus') + obj = bld(features = 'command-output') obj.command = 'cpp' obj.command_is_external = True obj.no_inputs = True obj.argv = menus_argv obj.dep_vars = ['GTKOSX'] - - if bld.is_defined('TRX_BUILD'): - obj.stdin = 'trx.menus.in' - obj.stdout = 'trx.menus' - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'trx.menus') - else: - obj.stdin = 'ardour.menus.in' - obj.stdout = 'ardour.menus' - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'ardour.menus') + obj.stdin = 'ardour.menus.in' + obj.stdout = 'ardour.menus' + bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), + 'ardour.menus') # Keybindings