Fix issue 0019972: EDF 810 GEOM: doxygen documentation: exclude 'geompyDC' from docum...

diff --git a/doc/salome/gui/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in
index 26ae2c4db8ab201d753b2ca1183c489923aa04c0..97e691fdc4b390b7b13a65fb4d389188519a1ee5 100755 (executable)
--- a/doc/salome/gui/GEOM/doxyfile_py.in
+++ b/doc/salome/gui/GEOM/doxyfile_py.in
@@ -77,8 +77,8 @@ EXAMPLE_RECURSIVE      = NO
 #---------------------------------------------------------------------------
 #Input related options
 #---------------------------------------------------------------------------
-INPUT             = @top_srcdir@/src/GEOM_SWIG
-FILE_PATTERNS     = geompyDC.py
+INPUT             = @top_builddir@/src/GEOM_SWIG
+FILE_PATTERNS     = geompy.py
 IMAGE_PATH        = @srcdir@/images
 EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
 RECURSIVE         = NO

diff --git a/doc/salome/gui/GEOM/input/geompy.doc b/doc/salome/gui/GEOM/input/geompy.doc
index f35e6c16be919a6bcaebc878d5dcc076b4ea5b47..eb3198c5e70e1d370b7e500250ed3948da9701ca 100644 (file)
--- a/doc/salome/gui/GEOM/input/geompy.doc
+++ b/doc/salome/gui/GEOM/input/geompy.doc
@@ -6,7 +6,7 @@
 <a href="geompy_doc/modules.html">structured documentation for geompy.py</a>,
 where all package functionality is separated in groups by purpose.
 
-\n Also you can find any function in the \ref geompyDC::geompyDC
+\n Also you can find any function in the \ref geompy
 "linear documentation for geompy.py".
 
 */

diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index dc15d10475c484968032a3acf0524c067e242dd6..7b9444bc7ffdf6366cb8216bdf291c15dc0c0c81 100644 (file)
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -27,31 +27,19 @@ EXTRA_DIST+=GEOM
 
 doxygen=@DOXYGEN@
 
-# Below command replaces "geompyDC" by "geompy" except cases
-# "sgeompyDC", "1geompyDC" and "egeompyDC" (these sequences
-# can be found in file names and must not be replaces):
-#
-# sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp;
-#
 usr_docs:
-       cd ./GEOM; \
+       echo "Replacing geompyDC by geompy" ; \
+       sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g"        \
+         -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py >    \
+         $(top_builddir)/src/GEOM_SWIG/geompy.py ;                             \
+       cd ./GEOM ; \
        echo "Running doxygen in directory: "`pwd`; \
        $(doxygen) ./doxyfile_tui; \
-       echo "Processing geompyDC.py file: "; \
+       echo "Processing geompy.py file: "; \
        $(doxygen) ./doxyfile_py; \
-       cd ./geompy_doc; \
-       filesl=`find .`; \
-       for filen in $${filesl}; do \
-         sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp1; \
-         sed 's/geompy\.geompy/geompy/g' ./tmp1 > ./tmp; \
-         rm -f tmp1; \
-         sed 's/geompy::geompy/geompy/g' ./tmp > ./tmp1; \
-         rm -f tmp; \
-         mv -f tmp1 $${filen}; \
-       done; \
-       cd ..; \
        echo "Running doxygen in directory: "`pwd`; \
-       $(doxygen) ./doxyfile;
+       $(doxygen) ./doxyfile; \
+       rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py
 
 docs: usr_docs
 

diff --git a/doc/salome/tui/GEOM/doxyfile.in b/doc/salome/tui/GEOM/doxyfile.in
index cba99e1cabf307491b153268d587cb9e34772f97..2573e187c3c53b5d1829d92615018788e2684fda 100755 (executable)
--- a/doc/salome/tui/GEOM/doxyfile.in
+++ b/doc/salome/tui/GEOM/doxyfile.in
@@ -77,10 +77,12 @@ WARN_LOGFILE           = log.txt
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../../../share/salome/src \
+                        ../../../build/salome/src/GEOM_SWIG/geompy.py \
                         ../../../share/salome/idl
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
-EXCLUDE                = 
+EXCLUDE                = ../../../share/salome/src/GEOM_SWIG/geompy.py \
+                        ../../../share/salome/src/GEOM_SWIG/geompyDC.py
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 

diff --git a/doc/salome/tui/GEOM/doxyfile_py.in b/doc/salome/tui/GEOM/doxyfile_py.in
index 9d4d118dbb81325b938d751e7e2db2e5d5fd3c2a..b2ac16a74e719f0bcb7a1adbe1861aabbad8795d 100755 (executable)
--- a/doc/salome/tui/GEOM/doxyfile_py.in
+++ b/doc/salome/tui/GEOM/doxyfile_py.in
@@ -77,11 +77,13 @@ WARN_LOGFILE           = log.txt
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ../../../share/salome/src \
+                        ../../../build/salome/src/GEOM_SWIG/geompy.py \
                         ../../../share/salome/idl \
                         ../../../build/salome/bin
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
 RECURSIVE              = YES
-EXCLUDE                = 
+EXCLUDE                = ../../../share/salome/src/GEOM_SWIG/geompy.py \
+                        ../../../share/salome/src/GEOM_SWIG/geompyDC.py
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index b401ba21021afbdc9d0a53a8e8a12ced5f79780d..a6cfe472b68121f8c92eb04e9a9a8ee4b34b5fc5 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -24,7 +24,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 EXTRA_DIST+=GEOM
 
-dev_docs:
+dev_docs: doxyfile
+       echo "===========================================" ;                    \
+       echo "Replacing geompyDC by geompy" ;                                   \
+       echo "===========================================" ;                    \
+       sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g"        \
+         -e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py >    \
+         $(top_builddir)/src/GEOM_SWIG/geompy.py ;                             \
+       echo "===========================================" ;                    \
+       echo "Generating TUI documentation" ;                                   \
+       echo "===========================================" ;                    \
        cp -fr $(srcdir)/GEOM ./INPUT; \
        cp -f ./GEOM/doxyfile ./INPUT; \
        cd INPUT; \
@@ -49,7 +58,20 @@ dev_docs:
        $(DOXYGEN) ./doxyfile; \
        cd ../; \
        cp -fr $(srcdir)/GEOM/sources/ GEOM/ ; \
-       rm -fr INPUT
+       rm -fr INPUT ; \
+       rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py
+
+clean-local:
+       -rm -fr GEOM doxygen.bak
+
+install-data-local:
+       if test -d GEOM; then \
+         $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \
+         cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \
+       fi;
+
+uninstall-local:
+       rm -rf $(DESTDIR)$(docdir)/tui/GEOM
 
 doctuidir=$(docdir)/tui/GEOM