From 4fe30364951ea46b93e3c93acbaf2f777343d131 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 25 Jan 2020 06:20:16 +0100 Subject: [PATCH] Update waf2.x "subst" feature uses obj attributes --- libs/fst/wscript | 4 +--- libs/plugins/a-comp.lv2/wscript | 2 +- libs/plugins/a-delay.lv2/wscript | 2 +- libs/plugins/a-eq.lv2/wscript | 2 +- libs/plugins/a-exp.lv2/wscript | 2 +- libs/plugins/a-fluidsynth.lv2/wscript | 2 +- libs/plugins/a-reverb.lv2/wscript | 2 +- libs/plugins/reasonablesynth.lv2/wscript | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libs/fst/wscript b/libs/fst/wscript index 64b7bb5d5b..0ef6cfe396 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -52,9 +52,7 @@ def build(bld): obj.target = 'ardour-vst-scanner' obj.chmod = Utils.O755 obj.install_path = os.path.join(bld.env['LIBDIR']) - obj.dict = { - 'VERSION' : bld.env['VERSION'], - } + obj.VERSION = bld.env['VERSION'] obj = bld (features = 'c cxx cxxprogram wine') obj.source = ( diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index 9c841d08dc..c739e4bea7 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -32,7 +32,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index 24fac5ff4a..3458dc7ea1 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -32,7 +32,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index c3f2b35cd4..fd6853a79d 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -32,7 +32,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index 7fb14a4e80..fb526376a4 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -32,7 +32,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index 462b4f89db..a2c5cdc0ed 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -31,7 +31,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'cxx cshlib', diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index 04cbd11cab..6196af70b1 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -31,7 +31,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib', diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 73cbe6a089..2ee6b399f3 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -31,7 +31,7 @@ def build(bld): obj.target = '../../LV2/%s/%s' % (bundle, i) obj.install_path = '${LV2DIR}/%s' % bundle obj.chmod = Utils.O644 - obj.dict = {'LIB_EXT': module_ext} + obj.LIB_EXT = module_ext # Build plugin library obj = bld(features = 'c cshlib',