From e9aa96aaca0f745a23db27a9def6170dd0e26380 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 19 Oct 2012 23:25:57 +0000 Subject: Fix online documentation building. --- wscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 9d0cb20..74d76b0 100644 --- a/wscript +++ b/wscript @@ -14,7 +14,7 @@ import waflib.Scripting as Scripting # Variables for 'waf dist' APPNAME = 'lv2' -VERSION = '1.2.0' +VERSION = '1.2.1' # Mandatory variables top = '.' @@ -40,12 +40,12 @@ def configure(conf): Options.options.build_tests = False Options.options.no_plugins = True + if Options.options.online_docs: + Options.options.docs = True + autowaf.configure(conf) autowaf.set_c99_mode(conf) - if Options.options.online_docs and Options.options.docs: - conf.fatal('At most one of --online-docs and --docs may be given') - if Options.platform == 'win32' or not hasattr(os.path, 'relpath'): Logs.warn('System does not support linking headers, copying') Options.options.copy_headers = True @@ -308,7 +308,7 @@ def build(bld): for i in bld.env.LV2_BUILD: bld.recurse(i) - if bld.env.DOCS: + if bld.env.DOCS or bld.env.ONLINE_DOCS: # Build Doxygen documentation (and tags file) autowaf.build_dox(bld, 'LV2', VERSION, top, out, 'lv2plug.in/doc') -- cgit v1.2.1