summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:03 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 18:14:27 +0100
commitdc15972a98d7b60bd81f9a6b456ecccaeb7c654d (patch)
tree1bb62d4a902388d4a0440c4524ab838a03aee9ea /wscript
parentccc9b971ab206fa3dc32a432a3e76db976192f58 (diff)
parent8cb9c6430dc0056f8d40b4d8e0bdc616ff397e1f (diff)
downloadganv-dc15972a98d7b60bd81f9a6b456ecccaeb7c654d.tar.gz
ganv-dc15972a98d7b60bd81f9a6b456ecccaeb7c654d.tar.bz2
ganv-dc15972a98d7b60bd81f9a6b456ecccaeb7c654d.zip
Update autowaf and adapt to new API
Diffstat (limited to 'wscript')
-rw-r--r--wscript13
1 files changed, 4 insertions, 9 deletions
diff --git a/wscript b/wscript
index b7d049a..8f9602c 100644
--- a/wscript
+++ b/wscript
@@ -21,10 +21,8 @@ out = 'build' # Build directory
def options(ctx):
ctx.load('compiler_c')
ctx.load('compiler_cxx')
- autowaf.set_options(ctx, test=True)
- opt = ctx.get_option_group('Configuration options')
- autowaf.add_flags(
- opt,
+ ctx.add_flags(
+ ctx.configuration_options(),
{'no-graphviz': 'do not compile with graphviz support',
'light-theme': 'use light coloured theme',
'no-fdgl': 'use experimental force-directed graph layout',
@@ -32,7 +30,6 @@ def options(ctx):
'gir': 'build GObject introspection data'})
def configure(conf):
- autowaf.display_header('Ganv Configuration')
conf.load('compiler_c', cache=True)
conf.load('compiler_cxx', cache=True)
conf.load('autowaf', cache=True)
@@ -226,10 +223,8 @@ def build(bld):
bld.add_post_fun(autowaf.run_ldconfig)
-def test(ctx):
- autowaf.pre_test(ctx, APPNAME)
- autowaf.run_tests(ctx, APPNAME, ['src/ganv_test'], dirs=['./src'])
- autowaf.post_test(ctx, APPNAME)
+def test(tst):
+ tst.run(['./src/ganv_test'])
def i18n(bld):
autowaf.build_i18n(bld, '..', 'ganv', APPNAME, ganv_source,