From: eap Date: Wed, 2 Mar 2011 15:12:48 +0000 (+0000) Subject: fix "Replacing smeshDC by smesh" X-Git-Tag: StartingPortingMED3~37 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=4ecb49a22ef9aac4cd34d72fa1257a5736d5a185;ds=sidebyside fix "Replacing smeshDC by smesh" 1) make global functions of class smeshDC only, class Mesh and others remain untouched 2) make temporary smesh.py in the current dir to avoid overwriting smesh.py when building in SMESH_SRC --- diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am index 1bb1e9bee..65acf38b5 100755 --- a/doc/salome/gui/SMESH/Makefile.am +++ b/doc/salome/gui/SMESH/Makefile.am @@ -34,9 +34,8 @@ usr_docs: doxyfile_py doxyfile echo "===========================================" ; \ echo "Replacing smeshDC by smesh" ; \ echo "===========================================" ; \ - sed -e "/class smeshDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g" \ - -e "s/smeshDC/smesh/g" $(top_srcdir)/src/SMESH_SWIG/smeshDC.py > \ - $(top_builddir)/src/SMESH_SWIG/smesh.py ; \ + awk '/^class Mesh:/ { mesh_found=1 } // { if (mesh_found) {print $$0; next} } /^ +(def|#)/ { match( $$0, /^ +/); print substr( $$0, 1+RLENGTH ); next } /^class smeshDC/ { next } //' \ + $(top_srcdir)/src/SMESH_SWIG/smeshDC.py > ./smesh.py ; \ echo "===========================================" ; \ echo "Generating Python interface documentation"; \ echo "===========================================" ; \ @@ -45,7 +44,7 @@ usr_docs: doxyfile_py doxyfile echo "Generating GUI documentation" ; \ echo "===========================================" ; \ $(DOXYGEN) doxyfile ; \ - rm -f $(top_builddir)/src/SMESH_SWIG/smesh.py + rm -f ./smesh.py docs: usr_docs