From 4131602593b488db748e6ab59e0b265f3b7b70db Mon Sep 17 00:00:00 2001
From: benn <benny.lyons@gmx.net>
Date: Mon, 7 Aug 2023 23:42:57 +0200
Subject: [PATCH] Upgrade: disable doxygen builder (WIP)

BuilderDoxygen and BuilderGCH are external plug-ins,
not developed in this project and probably unmaintained.

TODO: decide how to fix or replace them...
---
 SConstruct                        | 8 +++++---
 admin/scons/BuilderDoxygen.py     | 3 ++-
 admin/scons/LumieraEnvironment.py | 4 ++--
 doc/SConscript                    | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index aae65557f..32afeaab0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,15 +59,17 @@ env.Clean ('build', [ 'src/pre.gch' ])
 ### === Alias Targets === ###########################################
 
 # pick up the targets defined by the sub SConscripts
-Import('lumiera plugins tools gui testsuite doxydoc')
+#Import('lumiera plugins tools gui testsuite doxydoc')
+Import('lumiera plugins tools gui testsuite')
 
 build = env.Alias('build', lumiera + plugins + tools + gui)
 env.Default('build')
 # SCons default target
 
 
-env.Alias ('all', build + testsuite + doxydoc)
-env.Alias ('doc', doxydoc)
+#env.Alias ('all', build + testsuite + doxydoc)
+env.Alias ('all', build + testsuite)
+#env.Alias ('doc', doxydoc)
 env.Alias ('none')
 
 env.Alias('install', gui)
diff --git a/admin/scons/BuilderDoxygen.py b/admin/scons/BuilderDoxygen.py
index cf20a5ddf..5587bfe74 100644
--- a/admin/scons/BuilderDoxygen.py
+++ b/admin/scons/BuilderDoxygen.py
@@ -34,12 +34,13 @@ def DoxyfileParse(file_contents):
     
     import shlex
     lex = shlex.shlex(instream = file_contents, posix = True)
+    #lex = shlex.shlex(instream = file_contents, infile = file_contents, posix = True)
     lex.wordchars += "*+./-:"
     lex.whitespace = lex.whitespace.replace("\n", "")
     lex.escape = ""
     
     lineno = lex.lineno
-    token = lex.get_token()
+    token = lex.read_token()
     key = token   # the first token should be a key
     last_token = ""
     key_token = False
diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py
index f8fb2405b..e7d45ab05 100644
--- a/admin/scons/LumieraEnvironment.py
+++ b/admin/scons/LumieraEnvironment.py
@@ -38,8 +38,8 @@ class LumieraEnvironment(Environment):
         Environment.__init__ (self, **kw)
         self.path = Record (extract_localPathDefs(buildSetup))    # e.g. buildExe -> env.path.buildExe
         self.libInfo = {}
-        self.Tool("BuilderGCH")
-        self.Tool("BuilderDoxygen")
+        #self.Tool("BuilderGCH")
+        #self.Tool("BuilderDoxygen")
         self.Tool("ToolDistCC")
         self.Tool("ToolCCache")
         register_LumieraResourceBuilder(self)
diff --git a/doc/SConscript b/doc/SConscript
index e20bb4eb0..3cfad6e36 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -7,10 +7,10 @@
 Import('env')
 
 
-doxydoc = env.Doxygen('devel/Doxyfile')
+#doxydoc = env.Doxygen('devel/Doxyfile')
 
 #  env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=documentation)
-env.Clean (doxydoc, doxydoc + ['devel/,doxylog','devel/warnings.txt'])
+#env.Clean (doxydoc, doxydoc + ['devel/,doxylog','devel/warnings.txt'])
 
 
-Export('doxydoc')
+#Export('doxydoc')