CoTech decision: move MEDWrapper from MED to SMESH

Remove dependency on MED module

diff --git a/Makefile.am b/Makefile.am
index b09f19f44872c647cc724b3657f9fd4e5213e8f5..bac9c9d4ba4e1db9660003073ffdc0b7c10222f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,13 +28,11 @@ if GHS3DPRLPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                     -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 else !GHS3DPRLPLUGIN_ENABLE_GUI
   ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                     -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-                    -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
                     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 endif

diff --git a/build_configure b/build_configure
index 6a4d2c20112a9b32fac982b0fa267b6dcc609d3a..db353cc5916f8e8ba54ae187750054ce6eca3efe 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -44,10 +44,10 @@ fi
 ########################################################################
 # Test if the MED_ROOT_DIR is set correctly
 
-if test ! -d "${MED_ROOT_DIR}"; then
-    echo "failed : MED_ROOT_DIR variable is not correct !"
-    exit
-fi
+# if test ! -d "${MED_ROOT_DIR}"; then
+#     echo "failed : MED_ROOT_DIR variable is not correct !"
+#     exit
+# fi
 
 ########################################################################
 # Test if the GEOM_ROOT_DIR is set correctly
@@ -83,13 +83,11 @@ if test -d "${GUI_ROOT_DIR}"; then
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
           -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-          -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
           -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
 else
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-          -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
           -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
           -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
 fi

diff --git a/configure.ac b/configure.ac
index 86495a3c3943df31a2b03f9281d5b719d8bc7c69..9d67b1dd365d1efe3892a5916af83f5a790da5c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,11 +343,11 @@ CHECK_GEOM
 
 echo
 echo ---------------------------------------------
-echo Testing Med
+echo Testing MED3
 echo ---------------------------------------------
 echo
  
-CHECK_MED
+CHECK_MED3
 
 echo
 echo ---------------------------------------------
@@ -375,13 +375,13 @@ echo
 #AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
 
 if test "${gui_ok}" = "yes"; then
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok gui_ok libxml_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok libxml_ok"
   opt_variables="GHS3DPRL_ok"
 elif test "${SalomeGUI_need}" != "no"; then
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok gui_ok libxml_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok libxml_ok"
   opt_variables="GHS3DPRL_ok"
 else
-  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok libxml_ok"
+  variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok libxml_ok"
   opt_variables="GHS3DPRL_ok"
 fi
 

diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/CMakeLists.txt b/doc/salome/gui/GHS3DPRLPLUGIN/CMakeLists.txt
index af0f33f85a40f35caeffbb575b44f8afab4150bb..7c358a1f5adb987e9c4b197e3883053318daf95b 100755 (executable)
--- a/doc/salome/gui/GHS3DPRLPLUGIN/CMakeLists.txt
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/CMakeLists.txt
@@ -44,8 +44,6 @@ IF(WINDOWS)
   @SET PATH=$ENV{KERNEL_ROOT_DIR}/lib/salome\;%PATH%
   @SET PYTHONPATH=$ENV{KERNEL_ROOT_DIR}/bin/salome\;%PYTHONPATH%
   @SET PYTHONPATH=$ENV{KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome\;%PYTHONPATH%
-  @SET PYTHONPATH=$ENV{MED_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome\;%PYTHONPATH%
-  @SET PYTHONPATH=$ENV{MED_ROOT_DIR}/bin/salome\;%PYTHONPATH%
   @SET PYTHONPATH=$ENV{GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome\;%PYTHONPATH%
   @SET PYTHONPATH=$ENV{GEOM_ROOT_DIR}/bin/salome\;%PYTHONPATH%
   @SET PYTHONPATH=$ENV{SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome\;%PYTHONPATH%
@@ -57,8 +55,8 @@ IF(WINDOWS)
   SET(EXT "bat")
   SET(CALL_STR "call")
 ELSE(WINDOWS)
-  SET(DOC_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/bin/salome:${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome:${SMESH_ROOT_DIR}/bin/salome:${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${MED_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${GEOM_ROOT_DIR}/bin/salome:${GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${KERNEL_ROOT_DIR}/bin/salome:${KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${OMNIORB_ROOT_USER}/lib/python${PYTHON_VERSION}/site-packages:${OMNIORB_ROOT_USER}/lib64/python${PYTHON_VERSION}/site-packages)
-  SET(DOC_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome")
+  SET(DOC_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/bin/salome:${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome:${SMESH_ROOT_DIR}/bin/salome:${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${GEOM_ROOT_DIR}/bin/salome:${GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${KERNEL_ROOT_DIR}/bin/salome:${KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${OMNIORB_ROOT_USER}/lib/python${PYTHON_VERSION}/site-packages:${OMNIORB_ROOT_USER}/lib64/python${PYTHON_VERSION}/site-packages)
+  SET(DOC_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome")
   SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:\${PYTHONPATH}
   export LD_LIBRARY_PATH=${DOC_LD_LIBRARY_PATH}:\${LD_LIBRARY_PATH}
   export SMESH_MeshersList=${DOC_SMESH_MeshersList}

diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am b/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am
index 28bc8e7f8336d764bf897267725c0e28f3e1e2da..742b7b0f6bfe09b2f167451e68e69a786fe32206 100755 (executable)
--- a/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am
+++ b/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am
@@ -23,8 +23,8 @@ EXTRA_DIST += images input static/footer.html static/salome_extra.css
 guidocdir = $(docdir)/gui/GHS3DPRLPLUGIN
 guidoc_DATA = images/head.png
 
-DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(MED_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
-DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(SMESH_ROOT_DIR)/lib/salome:$(MED_ROOT_DIR)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome
+DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
+DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(SMESH_ROOT_DIR)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome
 DOC_SMESH_MeshersList=GHS3DPRLPlugin
 
 tmp/smeshBuilder.py: $(top_srcdir)/src/GHS3DPRLPlugin/GHS3DPRLPluginBuilder.py

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 0ab2ea2ea73131dbdbcfbe939f89b6cfd3747ff7..29d1a51bcf2790aec2d5c1cbfbec5b10d97e104e 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -49,14 +49,12 @@ libSalomeIDLGHS3DPRLPLUGIN_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        $(GEOM_CXXFLAGS) \
-       $(MED_CXXFLAGS) \
        $(SMESH_CXXFLAGS)
 
 libSalomeIDLGHS3DPRLPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeIDLGHS3DPRLPLUGIN_la_LIBADD  = \
        $(KERNEL_LDFLAGS) -lSalomeIDLKernel \
        $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        $(SMESH_LDFLAGS) -lSalomeIDLSMESH \
        @CORBA_LIBS@
 
@@ -68,7 +66,6 @@ OMNIORB_IDLPYFLAGS  = \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
        -I$(GEOM_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome \
        -I$(SMESH_ROOT_DIR)/idl/salome
 
 IDLCXXFLAGS = \
@@ -77,13 +74,11 @@ IDLCXXFLAGS = \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
        -I$(GEOM_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome \
        -I$(SMESH_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
        -I$(GEOM_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome \
        -I$(SMESH_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs
@@ -121,7 +116,7 @@ mostlyclean-local:
        @for dep in $^ dummy; do \
          if [ $$dep != "dummy" ]; then \
            echo Building dependencies for $$dep; \
-           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
+           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
            sed 's/\.o/\SK.cc/' >>$@; \
          fi; \
        done ;

diff --git a/src/GHS3DPRLPlugin/Makefile.am b/src/GHS3DPRLPlugin/Makefile.am
index 89ab43b9ff413065863f6106223eba721f990cb1..3ed878f1a98ff1e7a16d5921075b62f4e82f30a8 100644 (file)
--- a/src/GHS3DPRLPlugin/Makefile.am
+++ b/src/GHS3DPRLPlugin/Makefile.am
@@ -45,7 +45,6 @@ dist_libGHS3DPRLEngine_la_SOURCES =   \
 libGHS3DPRLEngine_la_CPPFLAGS =        \
         $(KERNEL_CXXFLAGS)     \
         $(GUI_CXXFLAGS)                \
-       $(MED_CXXFLAGS)         \
        $(GEOM_CXXFLAGS)        \
        $(CAS_CPPFLAGS)         \
        $(VTK_INCLUDES) \
@@ -58,7 +57,6 @@ libGHS3DPRLEngine_la_CPPFLAGS =       \
 libGHS3DPRLEngine_la_LDFLAGS  =                        \
        ../../idl/libSalomeIDLGHS3DPRLPLUGIN.la \
        $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo -lTKCDF \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lSMESHDS -lSMDS -lStdMeshers -lMeshDriverGMF \
        $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics -lSalomeNS -lOpUtil
 

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index d69217c75e9af1cfa8e29e462ecda52a643a7911..587809809576cf3ef1ea64f043cd122ccececd29 100644 (file)
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -50,7 +50,6 @@ libGHS3DPRLPluginGUI_la_CPPFLAGS =    \
        $(KERNEL_CXXFLAGS)              \
        $(GUI_CXXFLAGS)                 \
        $(GEOM_CXXFLAGS)                \
-       $(MED_CXXFLAGS)                 \
        $(SMESH_CXXFLAGS)               \
        $(BOOST_CPPFLAGS)               \
        $(CORBA_CXXFLAGS)               \
@@ -62,7 +61,6 @@ libGHS3DPRLPluginGUI_la_LDFLAGS =             \
        ../../idl/libSalomeIDLGHS3DPRLPLUGIN.la \
        $(QT_LIBS) \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-       $(MED_LDFLAGS) -lSalomeIDLMED \
        $(GEOM_LDFLAGS) -lGEOM \
        $(SMESH_LDFLAGS) -lSMESH -lGeomSelectionTools  -lStdMeshersGUI -lSMESHFiltersSelection \
        $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \