From: Vladimír Vondruš <mosra@centrum.cz>
Date: Wed, 25 Apr 2018 11:11:55 +0000 (+0200)
Subject: doxygen: it's CREATE_SUBDIRS, not GENERATE_SUBDIRS. Stupid me.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=d4852b3133215f4361879c0b5c8b3a1625501a34;p=blog.git

doxygen: it's CREATE_SUBDIRS, not GENERATE_SUBDIRS. Stupid me.
---

diff --git a/doc/doxygen.rst b/doc/doxygen.rst
index 82ea3c65..b3e3c172 100644
--- a/doc/doxygen.rst
+++ b/doc/doxygen.rst
@@ -910,7 +910,7 @@ positives, this information is not present in the non-verbose output.
     detailed description present, skipping
 
 Besides the above, the output will be mostly empty also if you have the
-:ini:`GENERATE_SUBDIRS` Doxyfile option enabled. This option causes Doxygen to
+:ini:`CREATE_SUBDIRS` Doxyfile option enabled. This option causes Doxygen to
 scatter the XML files across numerous subdirectories to work around limits of
 ancient filesystems. m.css doesn't support it and probably never will, set it
 back to ``NO`` it in your ``Doxyfile-mcss`` override. For easier debugging,
diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index bce910bc..74f2db36 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -2608,7 +2608,7 @@ def parse_doxyfile(state: State, doxyfile, config = None):
     continuation_re = re.compile(r"""^\s*(?P<quote>['"]?)(?P<value>.*)(?P=quote)\s*(?P<backslash>\\?)$""")
 
     default_config = {
-        'GENERATE_SUBDIRS': ['NO'],
+        'CREATE_SUBDIRS': ['NO'],
         'PROJECT_NAME': ['My Project'],
         'OUTPUT_DIRECTORY': [''],
         'XML_OUTPUT': ['xml'],
@@ -2737,7 +2737,7 @@ list using <span class="m-label m-dim">&darr;</span> and
         if i in config: state.doxyfile[i] = int(' '.join(config[i]))
 
     # Boolean values that we want
-    for i in ['GENERATE_SUBDIRS',
+    for i in ['CREATE_SUBDIRS',
               'M_EXPAND_INNER_TYPES',
               'M_SEARCH_DISABLED',
               'M_SEARCH_DOWNLOAD_BINARY']:
@@ -2752,8 +2752,8 @@ list using <span class="m-label m-dim">&darr;</span> and
         if i in config:
             state.doxyfile[i] = [line for line in config[i] if line]
 
-    if state.doxyfile['GENERATE_SUBDIRS']:
-        logging.fatal("{}: GENERATE_SUBDIRS is not supported, output will be most probably empty".format(doxyfile))
+    if state.doxyfile['CREATE_SUBDIRS']:
+        logging.fatal("{}: CREATE_SUBDIRS is not supported, output will be most probably empty".format(doxyfile))
 
 default_index_pages = ['pages', 'files', 'namespaces', 'modules', 'annotated']
 default_wildcard = '*.xml'
diff --git a/doxygen/test/doxyfile/Doxyfile-subdirs b/doxygen/test/doxyfile/Doxyfile-subdirs
index 130e06b0..45e0b502 100644
--- a/doxygen/test/doxyfile/Doxyfile-subdirs
+++ b/doxygen/test/doxyfile/Doxyfile-subdirs
@@ -1 +1 @@
-GENERATE_SUBDIRS = YES
+CREATE_SUBDIRS = YES
diff --git a/doxygen/test/test_doxyfile.py b/doxygen/test/test_doxyfile.py
index 5b9b61a5..fa105342 100644
--- a/doxygen/test/test_doxyfile.py
+++ b/doxygen/test/test_doxyfile.py
@@ -37,7 +37,7 @@ class Doxyfile(unittest.TestCase):
         state = State()
         parse_doxyfile(state, 'test/doxyfile/Doxyfile')
         self.assertEqual(state.doxyfile, {
-            'GENERATE_SUBDIRS': False,
+            'CREATE_SUBDIRS': False,
             'HTML_EXTRA_FILES': ['css', 'another.png', 'hello'],
             'HTML_EXTRA_STYLESHEET': ['a.css', 'b.css'],
             'HTML_OUTPUT': 'html',
@@ -70,7 +70,7 @@ list using <span class="m-label m-dim">&darr;</span> and
         state = State()
         parse_doxyfile(state, 'test/doxyfile/Doxyfile-subdirs')
         self.assertEqual(state.doxyfile, {
-            'GENERATE_SUBDIRS': True,
+            'CREATE_SUBDIRS': True,
             'HTML_EXTRA_FILES': [],
             'HTML_EXTRA_STYLESHEET': [
                 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600',