From c7d04a5e6bc419fa70ca70322e631c4a1f5c0a97 Mon Sep 17 00:00:00 2001 From: caremoli Date: Thu, 14 Jun 2007 12:21:26 +0000 Subject: [PATCH] CCAR: new configuration of doxygen : to validate --- doc/salome/tui/KERNEL/doxyuser.in | 16 ++++++++-------- doc/salome/tui/Makefile.am | 2 +- salome_adm/unix/config_files/check_htmlgen.m4 | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/salome/tui/KERNEL/doxyuser.in b/doc/salome/tui/KERNEL/doxyuser.in index 854a69cc4..4b407f61b 100644 --- a/doc/salome/tui/KERNEL/doxyuser.in +++ b/doc/salome/tui/KERNEL/doxyuser.in @@ -58,8 +58,8 @@ GENERATE_BUGLIST = NO GENERATE_DEPRECATEDLIST= NO ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 25 -SHOW_USED_FILES = NO -SHOW_DIRECTORIES = NO +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = YES FILE_VERSION_FILTER = #--------------------------------------------------------------------------- @@ -96,15 +96,15 @@ EXAMPLE_RECURSIVE = NO IMAGE_PATH = sources/ INPUT_FILTER = FILTER_PATTERNS = -FILTER_SOURCE_FILES = YES +FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO +SOURCE_BROWSER = YES +INLINE_SOURCES = YES STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO +REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES USE_HTAGS = NO VERBATIM_HEADERS = YES @@ -124,7 +124,7 @@ HTML_OUTPUT = KERNEL HTML_FILE_EXTENSION = .html HTML_HEADER = sources/myheader.html HTML_FOOTER = sources/footer.html -HTML_STYLESHEET = sources/doxygen.css +HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = @@ -134,7 +134,7 @@ BINARY_TOC = YES TOC_EXPAND = YES DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 993af3090..07b894756 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -49,9 +49,9 @@ usr_docs: $(DOXYGEN) ./doxyuser1; \ cd ..; $(INSTALL) -d $(docdir)/tui/KERNEL; - cp -fr KERNEL $(docdir)/tui cp -fr $(srcdir)/KERNEL/sources/static/*.* $(docdir)/tui/KERNEL; cp -fr $(srcdir)/KERNEL/sources/ $(docdir)/tui/KERNEL; + cp -fr KERNEL $(docdir)/tui cp -fr $(srcdir)/KERNEL/HTML/ $(docdir)/tui/KERNEL; cp -f $(srcdir)/pythfilter.py $(docdir)/tui/KERNEL; cp -fr $(srcdir)/KERNEL/exemple/ $(docdir)/tui/KERNEL; diff --git a/salome_adm/unix/config_files/check_htmlgen.m4 b/salome_adm/unix/config_files/check_htmlgen.m4 index 8e42b102e..ec51ec269 100644 --- a/salome_adm/unix/config_files/check_htmlgen.m4 +++ b/salome_adm/unix/config_files/check_htmlgen.m4 @@ -41,7 +41,7 @@ then DOXYGEN_WITH_PYTHON=yes DOXYGEN_WITH_STL=yes ;; - [1-9].[5-9]*) + [[1-9]].[[5-9]]*) DOXYGEN_WITH_PYTHON=yes DOXYGEN_WITH_STL=yes ;; -- 2.39.2