[geany/geany] 8961f0: Add option --disable-html-docs

Enrico Tröger git-noreply at xxxxx
Fri Aug 29 12:27:12 UTC 2014


Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Fri, 29 Aug 2014 12:27:12 UTC
Commit:      8961f0b6e96de3591aa30b3886572147c4321c2f
             https://github.com/geany/geany/commit/8961f0b6e96de3591aa30b3886572147c4321c2f

Log Message:
-----------
Add option --disable-html-docs


Modified Paths:
--------------
    wscript

Modified: wscript
12 lines changed, 11 insertions(+), 1 deletions(-)
===================================================================
@@ -233,7 +233,14 @@ def configure(conf):
     conf.env['use_gtk3'] = conf.options.use_gtk3
 
     # rst2html for the HTML manual
-    conf.env['RST2HTML'] = _find_rst2html(conf)
+    if not conf.options.no_html_doc:
+        try:
+            conf.env['RST2HTML'] = _find_rst2html(conf)
+        except WafError:
+            error_msg = '''Documentation enabled but rst2html not found.
+You can explicitly disable building of the HTML manual with --disable-html-docs,
+but you then may not have a local copy of the HTML manual.'''
+            raise WafError(error_msg)
 
     # Windows specials
     if is_win32:
@@ -336,6 +343,9 @@ def options(opt):
     opt.add_option('--enable-gtk3', action='store_true', default=False,
         help='compile with GTK3 support (experimental) [[default: No]',
         dest='use_gtk3')
+    opt.add_option('--disable-html-docs', action='store_true', default=False,
+        help='do not generate HTML documentation using rst2html [[default: No]',
+        dest='no_html_doc')
     # Paths
     opt.add_option('--mandir', type='string', default='',
         help='man documentation', dest='mandir')



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list