From 92c99e5b7d0ac3c8dc76ff843e02103daf9d9d46 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 8 Apr 2025 05:07:58 +0200 Subject: [PATCH] Upgrade: re-enable Doxygen generation The new version indeed works as expected, and current Doxygen produces much better cross links :-) --- admin/scons/LumieraEnvironment.py | 3 +- doc/SConscript | 6 +- wiki/thinkPad.ichthyo.mm | 234 ++++++++++++++++++++++++++++-- 3 files changed, 226 insertions(+), 17 deletions(-) diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py index e7d45ab05..6f87c2629 100644 --- a/admin/scons/LumieraEnvironment.py +++ b/admin/scons/LumieraEnvironment.py @@ -38,8 +38,7 @@ 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("BuilderDoxygen") self.Tool("ToolDistCC") self.Tool("ToolCCache") register_LumieraResourceBuilder(self) diff --git a/doc/SConscript b/doc/SConscript index 3cfad6e36..e20bb4eb0 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') diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 2e5567d4b..b9e5c5449 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -91295,7 +91295,7 @@ Date:   Thu Apr 20 18:53:17 2023 +0200
- + @@ -160471,8 +160471,7 @@ actively maintained upstream. Please remove gdl from Debian. ...und dafür auch den Basis-Konstruktor explizit sichtbar machen

- - + @@ -160493,10 +160492,216 @@ actively maintained upstream. Please remove gdl from Debian. - - + + + + + + + + + + + + + + + +

+ Feststellung: das ist eine deutlich überarbeitete Version vom gleichen Code +

+ + + + + + + + + +

+ Da hier offensichtlich eine Kontinuität besteht und die öffentliche SCons-Website (wenngleich um mehrere Ecken) auf dieses Tool verweist, erscheint es mir angezeigt, eine vollständige Historie bereitzustellen — wenngleich auch der Code selber direkt von Lumiera in-Tree ausgeliefert wird. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ alle diese Commits sind von Richard van der Hoff<richard@richvdh.org> am 12.8.2013 +

+ + + + + + + +

+ wenn man sich die Zeiten und Änderungen etwas anschaut, dann waren das experimentelle Fixes oder Verbesserungen, die am Ende des Tages irgendwie zusammengehängt wurden. +

+ + + + + + + + + + + + +

+ Denn der erste Code vor 2007 war im Scons-Wiki gespeichert, auf einer frei editierbaren Seite, auf der verschiedene Leute Fixes und neue Features vorgeschlagen haben. Es gab wohl mal ein eMail-Archiv, aber das ist schon vor langer Zeit verlorengegangen.... +

+ + + + + + + + + + + +

+ Commit Roussel Wilder on Mar 7, 2010 +

+

+ Dieses Commit-Datum geht hervor aus einem Mirror in https://github.com/ptomulik/scons_doxygen/commits/master/notes.txt +

+ + + + + + + 
The original plugin file is the file posted to http://www.scons.org/wiki/DoxygenBuilder by Matthew Nicolson
+2006-03-31.  Attached to this wiki page were two other files, both of which are in the repository history
+although removed from being in the working tree: doxygen_reiners_2007-02-26.py, and
+doxygen_boehme_2007-07-18.py.  Boehme's version seems to include many of the changes in Reiners but many of
+Reiners changes are missing from Boehme.  It is not clear why Reiner's changes have been reverted by Boehme.
+it seems appropriate to merge in Boehme's directly rather than Reiner's and then Boehme's.
+
+Robert Smallshire in his email of
+http://scons.tigris.org/ds/viewMessage.do?dsForumId=1272&dsMessageId=2383574 supports the move to use
+Boehme's version as the next iteration.  It may then be that a version he has can be merged in.
+
+Apart from one change to the builder command line, Norton's version seems to be Boehme's version with all
+the TAGFILE stuff removed.
+
+Since then others have made contributions, see the log for the history.
+ + + + + + + + + + + + +

+ Inhalt aus dem Archive.org-Snapshot +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ ich verwende einen Zwichen-Branch, um nur den Inhalt von admin/scons mit dem Subtree-Branch sconsDoxy zu verbinden +

+ + + + + + + + + + + + + + + + + + + + + + + + + @@ -160952,6 +161157,9 @@ actively maintained upstream. Please remove gdl from Debian. + + + @@ -162433,8 +162641,8 @@ actively maintained upstream. Please remove gdl from Debian. - - + + @@ -162493,8 +162701,10 @@ actively maintained upstream. Please remove gdl from Debian. - - + + + + @@ -162689,7 +162899,7 @@ actively maintained upstream. Please remove gdl from Debian. - + @@ -163150,7 +163360,7 @@ actively maintained upstream. Please remove gdl from Debian. - + @@ -163226,6 +163436,7 @@ actively maintained upstream. Please remove gdl from Debian. + @@ -163256,7 +163467,6 @@ actively maintained upstream. Please remove gdl from Debian. -