From: enk <enk@opencascade.com>
Date: Thu, 30 Mar 2006 12:28:36 +0000 (+0000)
Subject: Added support for doxygen1.4.4 and higher (with PYTHON documenation support)
X-Git-Tag: T3_2_0b1_pre1~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bff8d08b7ba0fe94464ba22dcc5ece823619c42a;p=modules%2Fsmesh.git

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 7ca364bc0..7a6dfef07 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -168,6 +168,10 @@ CXXFLAGS+= $(CORBA_CXXFLAGS)
 #LDFLAGS+= $(CORBA_LIBS)
 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@
 DYNAMIC_DIRS=@DYNAMIC_DIRS@
diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 894cc0c6d..052205542 100644
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -23,21 +23,39 @@ docs:
 	cp -fr $(srcdir)/SMESH ./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/SMESH_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)/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)/SMESH/sources/static/*.* ./SMESH/
 	cp -fr $(srcdir)/SMESH/sources/ SMESH/
 	cp -fr $(srcdir)/SMESH/HTML/ SMESH/
diff --git a/doc/salome/tui/SMESH/doxyfile b/doc/salome/tui/SMESH/doxyfile
index b008baa4d..e18dcf3ef 100755
--- a/doc/salome/tui/SMESH/doxyfile
+++ b/doc/salome/tui/SMESH/doxyfile
@@ -59,9 +59,10 @@ WARN_LOGFILE           = log.txt
 INPUT                  = ../../../share/salome/idl/SMESH_Gen.idl \
                          ../../../share/salome/idl/SMESH_Mesh.idl \
                          ../../../share/salome/idl/SMESH_BasicHypothesis.idl \
-                         ../../../share/salome/idl/SMESH_Hypothesis.idl
-FILE_PATTERNS          = 
-RECURSIVE              = NO
+                         ../../../share/salome/idl/SMESH_Hypothesis.idl \
+			 ../../../build/salome/bin
+FILE_PATTERNS          = *.idl python_extension_must_be_here
+RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =