From be74b2dfd8d915808f6be7a82e5821cbecee1814 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 9 Jul 2012 08:14:31 +0000 Subject: Factor out documentation fixup stuff to autowaf. Update Doxygen stuff and improve documentation style. Update to r70/autowaf. git-svn-id: http://svn.drobilla.net/lad/trunk/suil@4528 a436a847-0d15-0410-975c-d299462d15a1 --- NEWS | 2 +- doc/reference.doxygen.in | 4 ++-- waf | Bin 92492 -> 93356 bytes wscript | 24 +++--------------------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index 42309fb..4a26a97 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ suil (9999) unstable; - * Fix typo in suil_ui_supported() documentation * Correctly handle resizing for Gtk2 in Qt4 + * Improve documentation -- David Robillard diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in index b2b44c9..c6bf481 100644 --- a/doc/reference.doxygen.in +++ b/doc/reference.doxygen.in @@ -827,7 +827,7 @@ USE_HTAGS = NO # will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. -VERBATIM_HEADERS = YES +VERBATIM_HEADERS = NO #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index @@ -1708,7 +1708,7 @@ GRAPHICAL_HIERARCHY = NO # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. -DIRECTORY_GRAPH = YES +DIRECTORY_GRAPH = NO # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are svg, png, jpg, or gif. diff --git a/waf b/waf index f69957f..274c97e 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index b0ad1e2..305ac10 100644 --- a/wscript +++ b/wscript @@ -36,7 +36,7 @@ def options(opt): def configure(conf): conf.load('compiler_c') conf.load('compiler_cxx') - conf.line_just = 46 + conf.line_just = 40 autowaf.configure(conf) autowaf.display_header('Suil Configuration') @@ -154,27 +154,9 @@ def build(bld): if bld.env['DOCS']: bld.add_post_fun(fix_docs) -def build_dir(ctx, subdir): - if autowaf.is_child(): - return os.path.join('build', APPNAME, subdir) - else: - return os.path.join('build', subdir) - def fix_docs(ctx): - try: - top = os.getcwd() - os.chdir(build_dir(ctx, 'doc/html')) - os.system("sed -i 's/SUIL_API //' group__suil.html") - os.system("sed -i 's/SUIL_DEPRECATED //' group__suil.html") - os.system("sed -i 's/href=\"doc\/style.css\"/href=\"style.css\"/' group__suil.html") - os.remove('index.html') - os.symlink('group__suil.html', 'index.html') - os.chdir(top) - os.chdir(build_dir(ctx, 'doc/man/man3')) - os.system("sed -i 's/SUIL_API //' suil.3") - os.chdir(top) - except: - Logs.error("Failed to fix up %s documentation" % APPNAME) + if ctx.cmd == 'build': + autowaf.make_simple_dox(APPNAME) def upload_docs(ctx): os.system("rsync -ravz --delete -e ssh build/doc/html/ drobilla@drobilla.net:~/drobilla.net/docs/suil/") -- cgit v1.2.1