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 588b83ea8fc669d4052ea4e58569d3962d8d5f3b..d87c15807d3061d93e6407337266e4d95710dc09 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -171,6 +171,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/GEOM/doxyfile b/doc/salome/tui/GEOM/doxyfile
index 4cd39b4c5dc47ee7a1033335edaaefb77a18a037..d2f19a2fbcb6a8847df26b675499b9b3083a4a12 100755 (executable)
--- a/doc/salome/tui/GEOM/doxyfile
+++ b/doc/salome/tui/GEOM/doxyfile
@@ -56,9 +56,10 @@ WARN_LOGFILE           = log.txt
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/idl/GEOM_Gen.idl
-FILE_PATTERNS          = 
-RECURSIVE              = NO
+INPUT                  = ../../../share/salome/idl/GEOM_Gen.idl \
+                        ../../../build/salome/bin
+FILE_PATTERNS          = *.idl python_extension_must_be_here
+RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 

diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 8a2c77608984c804f1e5957e648440fed463b0a3..7f5979e978b3a817485f779b5b1950bb2e39eb42 100644 (file)
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -26,21 +26,39 @@ docs:
        cp -fr $(srcdir)/GEOM ./INPUT
        cd INPUT; \
        sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
-       mv -f doxyfile1 doxyfile; \
-       $(doxygen) ./doxyfile; \
-       mkdir py1; mkdir py2; \
-       cd ..
-       for file in $(PYTHON_SCRIPTS) dummy; do \
-         if [ $$file != "dummy" ]; then \
-           cp $(root_srcdir)/src/GEOM_SWIG/$$file INPUT/py1/; \
-         fi ; \
-       done
-       cd INPUT; \
-       python $(KERNEL_ROOT_DIR)/doc/salome/tui/KERNEL/pythfilter.py ./py1 ./py2; \
-       sed 's|list_py_files_to_process|$(PYTHON_SCRIPTS)|' ./doxyfile_py > py2/doxyfile_py; \
-       cd py2; \
-       $(doxygen) ./doxyfile_py; \
-       cd ../..; \
+       sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
+       mv -f doxyfile2 doxyfile1; \
+       if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
+         echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
+         sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+         $(doxygen) -u ./doxyfile1; \
+         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 ..; \
+       else \
+         sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
+         mv -f doxyfile2 doxyfile1; \
+         mv -f doxyfile1 doxyfile; \
+         $(doxygen) ./doxyfile; \
+         mkdir py1; mkdir py2; \
+         cd ..; \
+         for file in $(PYTHON_SCRIPTS) dummy; do \
+           if [ $$file != "dummy" ]; then \
+             cp $(root_srcdir)/src/GEOM_SWIG/$$file INPUT/py1/; \
+           fi ; \
+         done; \
+         cd INPUT; \
+         python $(KERNEL_ROOT_DIR)/share/doc/salome/tui/KERNEL/pythfilter.py ./py1 ./py2; \
+         sed 's|list_py_files_to_process|$(PYTHON_SCRIPTS)|' ./doxyfile_py > py2/doxyfile_py; \
+         cd py2; \
+         $(doxygen) ./doxyfile_py; \
+         cd ../..; \
+       fi; \
        cp -fr $(srcdir)/GEOM/sources/static/*.* ./GEOM/
        cp -fr $(srcdir)/GEOM/sources/ GEOM/
        cp -fr $(srcdir)/GEOM/HTML/ GEOM/