From 723ab60b39aed9a9190e047fc5803c1f4e1adac3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 29 Sep 2011 19:17:54 +0000 Subject: Upgrade to waf 1.6.7 and autowaf r52. git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf --- templates/wscript | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'templates') diff --git a/templates/wscript b/templates/wscript index 62ed37e5a2..4e1bb0fd6b 100644 --- a/templates/wscript +++ b/templates/wscript @@ -1,10 +1,9 @@ #!/usr/bin/python import os -import glob -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' def configure(conf): pass @@ -19,14 +18,13 @@ def build(bld): subst_dict['%JACK_INPUT%'] = 'alsa_pcm:playback_' subst_dict['%JACK_OUTPUT%'] = 'alsa_pcm:capture_' - templates = glob.glob(os.path.join(bld.get_curdir(), '*.template.in')) + templates = bld.path.ant_glob('*.template.in') for t in templates: - b = os.path.basename(t) - obj = bld.new_task_gen('subst') - obj.source = [ b ] - obj.target = [ b.replace('.in', '') ] + obj = bld(features = 'subst') + obj.source = [ t ] + obj.target = [ os.path.basename(t.srcpath()).replace('.in', '') ] obj.dict = subst_dict obj.install_path = os.path.join(bld.env['DATADIR'], 'ardour3', 'templates') -def set_options(opt): +def options(opt): pass -- cgit v1.2.3