Changeset 653440 in git

Timestamp:

Jul 11, 2014, 12:22:11 AM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

6a1aa7d0eeeb75c177a819b9a240c9c4c1948778

Parents:

7cdd912b9b6c44ae159128e2ef64cbaede6f8351

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-07-11 00:22:11+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-07-11 04:31:53+02:00

Message:

Added git HEAD ID to the doxygen output

Location:

dox

Files:

• Doxyfile.in (modified) (6 diffs)
• Makefile.am (modified) (2 diffs)
• footer.html (modified) (2 diffs)
• header.html (modified) (1 diff)

dox/Doxyfile.in

@@ -39 +39 @@
 # control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = " [$(git_version)] "
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -45 +45 @@
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF          = 
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
@@ -162 +162 @@
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    = libpolys
+STRIP_FROM_INC_PATH    = 
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
@@ -1138 +1138 @@
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_GAMMA  = 210
+HTML_COLORSTYLE_GAMMA  = 190
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
@@ -1954 +1954 @@
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = $(abs_top_builddir)/ \
+INCLUDE_PATH           = \
+                         $(abs_top_builddir)/ \
                          $(abs_top_builddir)/factory \
-                         $(abs_top_builddir)/libpolys
+                         $(abs_top_builddir)/libpolys \
+                         $(abs_top_srcdir)/ \
+                         $(abs_top_srcdir)/factory \
+                         $(abs_top_srcdir)/libpolys
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
@@ -1964 +1968 @@
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_FILE_PATTERNS  = *.h *.inc
 
 # The PREDEFINED tag can be used to specify one or more macro names that are

dox/Makefile.am

@@ +1 @@
+GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
+
 doxyrun:
         if [ -z "$(DOXYGEN)" ]; then \
@@ -14 +16 @@
         export abs_top_srcdir="$(abs_top_srcdir)"; \
         export abs_top_builddir="$(abs_top_builddir)"; \
-        echo Running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)"...; \
-        $(DOXYGEN) $(DOXYGEN_CONFIG) ;
+        export git_version="$(GIT_VERSION)"; \
+        echo Running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)", GIT_VERSION: "$(git_version)"...; \
+        $(DOXYGEN) $(DOXYGEN_CONFIG) ; \
+        echo Finished running "$(DOXYGEN)" "$(DOXYGEN_CONFIG)" with abs_top_srcdir: "$(abs_top_srcdir)", abs_top_builddir: "$(abs_top_builddir)", GIT_VERSION: "$(git_version)"...;
 
 if HAVE_DOXYGEN

dox/footer.html

@@ -5 +5 @@
   <ul>
     $navpath
-    <li class="footer">$generatedby<a href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion </li>
+    <li class="footer">$generatedby<a href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion for Singular <!--BEGIN PROJECT_NUMBER-->$projectnumber<!--END PROJECT_NUMBER--></li>
   </ul>
 </div>
@@ -11 +11 @@
 <!--BEGIN !GENERATE_TREEVIEW-->
 <hr class="footer"/><address class="footer"><small>
-$generatedby &#160;<a href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion
+$generatedby &#160;<a
+href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion for Singular <!--BEGIN PROJECT_NUMBER-->$projectnumber<!--END PROJECT_NUMBER-->
 </small></address>
 <!--END !GENERATE_TREEVIEW-->

dox/header.html

@@ -26 +26 @@
  <tr style="height: 56px;">
   <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img alt="Singular" src="$relpath^$projectlogo"/></td>
+  <td id="projectlogo"><img alt="Singular $projectnumber" src="$relpath^$projectlogo"/></td>
   <!--END PROJECT_LOGO-->
   <!--BEGIN PROJECT_NAME-->