Added support for doxygen1.4.4 and higher (with PYTHON documenation support)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index a142d1b21f63a5c0fde0ebdd1ffe3324dea78e40..6eac40541be9780be14bebba8905a2a81aa8b8d0 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -188,6 +188,8 @@ CXXFLAGS+= $(CORBA_CXXFLAGS)
 #LIBS+=$(CORBA_LIBS)
 
 DOXYGEN = @DOXYGEN@
+DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
+DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
 
 ## Shared libraries
 LT_STATIC_EXEC=@LT_STATIC_EXEC@

diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 0372e6a1f2e448628f6b4968c33fdeb9c4200686..e7722cd05c565328ed1a5bafb4fb3a539e8f73c4 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -20,7 +20,23 @@ docs:
        cp -fr $(srcdir)/SUIT ./INPUT; \
        cd INPUT; \
        sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
+       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
+       mv -f doxyfile2 doxyfile1; \
+       echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
+       if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
+         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+         $(doxygen) -u ./doxyfile1; \
+       else \
+         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+       fi; \
+       if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
+         sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+       fi; \
        mv -f doxyfile1 doxyfile; \
+       echo "Running doxygen in directory:"`pwd`; \
        $(doxygen) ./doxyfile; \
        cd ../; \
        cp -fr $(srcdir)/SUIT/sources/ SUIT ; \

diff --git a/doc/salome/tui/SUIT/doxyfile b/doc/salome/tui/SUIT/doxyfile
index 8c7e659d44d5031dcc4c920434dfaf7c23967740..f2b943e233b8965d003af98e06430539fea389c2 100755 (executable)
--- a/doc/salome/tui/SUIT/doxyfile
+++ b/doc/salome/tui/SUIT/doxyfile
@@ -71,8 +71,9 @@ WARN_LOGFILE           = log.txt
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../../../share/salome/src \
-                        ../../../share/salome/idl
-FILE_PATTERNS          = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx
+                        ../../../share/salome/bin \
+                        ../../../build/salome/bin
+FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc python_extension_must_be_here
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO