diff options
author | Carl Hetherington <carl@carlh.net> | 2012-06-08 13:24:34 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-06-08 13:24:34 +0000 |
commit | ad4713a2163037bad70adc7522932a1e90d7aef4 (patch) | |
tree | c438c02cc1525ec3eb7fdc35cc90879db7502dd6 /templates/wscript | |
parent | fa19e1a9d0b97233e130d301d906b3867a585950 (diff) |
Patch from Tim Mayberry to fix substitution and install of
session templates (#4918).
git-svn-id: svn://localhost/ardour2/branches/3.0@12607 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'templates/wscript')
-rw-r--r-- | templates/wscript | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/templates/wscript b/templates/wscript index 9e390434e6..dd60d401a5 100644 --- a/templates/wscript +++ b/templates/wscript @@ -10,24 +10,21 @@ def configure(conf): def build(bld): - subst_dict = {} if bld.is_defined('COREAUDIO_SUPPORT'): - subst_dict['%JACK_INPUT%'] = 'coreaudio:Built-in Audio:in' - subst_dict['%JACK_OUTPUT%'] = 'coreaudio:Built-in Audio:out' + subst_dict = {'JACK_INPUT': 'coreaudio:Built-in Audio:in', 'JACK_OUTPUT': 'coreaudio:Built-in Audio:out'} else: - subst_dict['%JACK_INPUT%'] = 'alsa_pcm:playback_' - subst_dict['%JACK_OUTPUT%'] = 'alsa_pcm:capture_' + subst_dict = {'JACK_INPUT': 'system:playback_','JACK_OUTPUT': 'system:capture_'} - templates = bld.path.ant_glob('*.template.in') + templates = bld.path.ant_glob('*/*.template.in') for t in templates: - obj = bld(features = 'subst') - obj.name = 'template' - obj.source = [ t ] dir_name = os.path.basename(t.srcpath()).replace('.template.in', '') file_name = os.path.basename(t.srcpath()).replace('.in', '') - obj.target = [ os.path.join(dir_name, file_name) ] - obj.dict = subst_dict - obj.install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name)) + obj = bld(features = 'subst', + name = 'template', + source = [ t ], + target = [ os.path.join(dir_name, file_name) ], + install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name))) + obj.__dict__.update(subst_dict) def options(opt): pass |