Issue 1375, doxygen and paths containing spaces

demos/doxy/test.conf

@@ -55,7 +55,6 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = NO
 FILE_VERSION_FILTER    = 
 QUIET                  = YES
 WARNINGS               = YES
@@ -67,7 +66,7 @@ WARN_LOGFILE           =
 INPUT                  = 
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = 
-RECURSIVE              = YES
+RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */.*/*
@@ -96,7 +95,6 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = 
 HTML_FOOTER            = 
 HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 HTML_DYNAMIC_SECTIONS  = NO
 CHM_FILE               = 

demos/doxy/wscript

@@ -15,6 +15,8 @@ def options(opt):
 
 def configure(conf):
 	conf.load('compiler_cxx doxygen')
+	if not conf.env.DOXYGEN:
+		conf.fatal('doxygen is required, install it')
 
 # NOTES:
 #

waflib/extras/doxygen.py

@@ -9,8 +9,6 @@ Doxygen support
 Variables passed to bld():
 * doxyfile -- the Doxyfile to use
 
-ported from waf 1.5 (incomplete)
-
 When using this tool, the wscript will look like:
 
 	def options(opt):
@@ -27,10 +25,10 @@ When using this tool, the wscript will look like:
 
 from fnmatch import fnmatchcase
 import os, os.path, re, stat
-from waflib import Task, Utils, Node, Logs
+from waflib import Task, Utils, Node, Logs, Errors
 from waflib.TaskGen import feature
 
-DOXY_STR = '${DOXYGEN} - '
+DOXY_STR = '"${DOXYGEN}" - '
 DOXY_FMTS = 'html latex man rft xml'.split()
 DOXY_FILE_PATTERNS = '*.' + ' *.'.join('''
 c cc cxx cpp c++ java ii ixx ipp i++ inl h hh hxx hpp h++ idl odl cs php php3
@@ -128,8 +126,7 @@ class doxygen(Task.Task):
 
 	def run(self):
 		dct = self.pars.copy()
-		# TODO will break if paths have spaces
-		dct['INPUT'] = ' '.join([x.abspath() for x in self.doxy_inputs])
+		dct['INPUT'] = ' '.join(['"%s"' % x.abspath() for x in self.doxy_inputs])
 		code = '\n'.join(['%s = %s' % (x, dct[x]) for x in self.pars])
 		code = code.encode() # for python 3
 		#fmt = DOXY_STR % (self.inputs[0].parent.abspath())