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

diff --git a/doc/salome/tui/KERNEL/doxyfile b/doc/salome/tui/KERNEL/doxyfile
index 1cb1191e839af5bf840578a8ee7d5807c08565e5..c19b684b2f6f2e967aed2364537a9567e0283d7f 100755 (executable)
--- a/doc/salome/tui/KERNEL/doxyfile
+++ b/doc/salome/tui/KERNEL/doxyfile
@@ -56,17 +56,23 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/idl/SALOME_ModuleCatalog.idl \
-                         ../../../share/salome/idl/SALOMEDS.idl \
-                         ../../../share/salome/idl/SALOME_Exception.idl \
-                         ../../../share/salome/idl/SALOMEDS_Attributes.idl \
-                         ../../../share/salome/idl/SALOME_Component.idl \
-                         ../../../share/salome/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx \
-                         ../../../share/salome/src/NamingService/SALOME_NamingService.hxx \
-                         ../../../share/salome/src/NamingService/SALOME_NamingService.cxx \
-                         ../../../share/salome/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
-FILE_PATTERNS          = 
-RECURSIVE              = NO
+INPUT                  = ../../../../share/salome/idl/SALOME_ModuleCatalog.idl \
+                       ../../../../share/salome/idl/SALOMEDS.idl \
+                       ../../../../share/salome/idl/SALOME_Exception.idl \
+                       ../../../../share/salome/idl/SALOMEDS_Attributes.idl \
+                       ../../../../share/salome/idl/SALOME_Component.idl \
+                       ../../../../share/salome/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx \
+                       ../../../../share/salome/src/NamingService/SALOME_NamingService.hxx \
+                       ../../../../share/salome/src/NamingService/SALOME_NamingService.cxx \
+                       ../../../../share/salome/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx \
+                       ../../../../build/salome/bin/salome \
+                       ../../../../build/salome/src/Batch_SWIG \
+                       ../../../../build/salome/src/Communication_SWIG \
+                       ../../../../build/salome/src/LifeCycleCORBA_SWIG \
+                       ../../../../build/salome/src/LifeCycleCORBA_SWIG \
+                       ../../../../build/salome/src/NOTIFICATION_SWIG
+FILE_PATTERNS          = *.idl *.hxx *.cxx python_extension_must_be_here
+RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 09511f9539bd1b3893e9524477370ae239e79ec2..a1e17c6a6e8a23f5a66309a7cbe4fe1df0accb77 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -16,10 +16,26 @@ userdoc:
        cp -fr $(srcdir)/KERNEL ./INPUT; \
        cd INPUT; \
        sed 's|../../../share/salome|@top_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; \
        $(DOXYGEN) ./doxyfile; \
        cd ..;
-       $(INSTALL) -d $(docdir)/tui/KERNEL; 
+       $(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 $(srcdir)/KERNEL/HTML/ $(docdir)/tui/KERNEL;

diff --git a/salome_adm/unix/config_files/check_htmlgen.m4 b/salome_adm/unix/config_files/check_htmlgen.m4
index 6f46e9fbacc29cf06cc01d732a99943ccb8ca32b..8e42b102ebcad6c61e16138fd485df69f6ed9144 100644 (file)
--- a/salome_adm/unix/config_files/check_htmlgen.m4
+++ b/salome_adm/unix/config_files/check_htmlgen.m4
@@ -12,6 +12,49 @@ then
   AC_MSG_WARN(doxygen not found)
   doxygen_ok=no
 fi
+if test "x$doxygen_ok" = "xyes"
+then
+  version=`$DOXYGEN --version`
+  AC_MSG_RESULT(doxygen version $version)
+  case "$version" in
+       1.4.4*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=no
+         ;;
+       1.4.5*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       1.4.6*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       1.4.7*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       1.4.8*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       1.4.9*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       [1-9].[5-9]*)
+         DOXYGEN_WITH_PYTHON=yes
+         DOXYGEN_WITH_STL=yes
+         ;;
+       *)
+         DOXYGEN_WITH_PYTHON=no
+         DOXYGEN_WITH_STL=no
+         ;;
+  esac
+  AC_MSG_RESULT(doxygen with support STL    - $DOXYGEN_WITH_STL)
+  AC_MSG_RESULT(doxygen with support PYTHON - $DOXYGEN_WITH_PYTHON)
+  AC_SUBST(DOXYGEN_WITH_PYTHON)
+  AC_SUBST(DOXYGEN_WITH_STL)
+fi
 dnl AC_SUBST(DOXYGEN)
 
 graphviz_ok=yes