From 10027999eed3f8ec2b98ab912c3642467c50ecdf Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 26 Jun 2013 09:19:37 +0000 Subject: [PATCH] CoTech decision: move MEDWrapper from MED to SMESH Remove dependency on MED --- Makefile.am | 3 +- build_configure | 15 ++- configure.ac | 26 ++--- idl/Makefile.am | 22 ++--- resources/COMPONENTCatalog.xml.in | 153 ------------------------------ 5 files changed, 28 insertions(+), 191 deletions(-) diff --git a/Makefile.am b/Makefile.am index 43fe978..34261d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am 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 ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files SUBDIRS = idl adm_local resources src bin diff --git a/build_configure b/build_configure index c15b308..08344ad 100755 --- a/build_configure +++ b/build_configure @@ -46,13 +46,13 @@ fi # exit #fi -######################################################################## -# Test if the MED_ROOT_DIR is set correctly +# ######################################################################## +# # 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 cd ${CONF_DIR} ABS_CONF_DIR=`pwd` @@ -69,8 +69,7 @@ ABS_CONF_DIR=`pwd` echo "======================================================= aclocal" 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 || exit 1 + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 # ____________________________________________________________________ # libtoolize creates some configuration files (ltmain.sh, diff --git a/configure.ac b/configure.ac index a351aeb..905be2e 100644 --- a/configure.ac +++ b/configure.ac @@ -249,21 +249,21 @@ echo CHECK_HDF5 -echo -echo --------------------------------------------- -echo testing MED -echo --------------------------------------------- -echo +# echo +# echo --------------------------------------------- +# echo testing MED +# echo --------------------------------------------- +# echo -CHECK_MED +# CHECK_MED -echo -echo --------------------------------------------- -echo testing MED3 -echo --------------------------------------------- -echo +# echo +# echo --------------------------------------------- +# echo testing MED3 +# echo --------------------------------------------- +# echo -CHECK_MED3 +# CHECK_MED3 echo echo --------------------------------------------- @@ -296,7 +296,7 @@ echo --------------------------------------------- echo echo Configure -variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok med3_ok omniORB_ok occ_ok" +variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok" for var in $variables do diff --git a/idl/Makefile.am b/idl/Makefile.am index e27fa06..7bc99e8 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -36,8 +36,7 @@ BASEIDL_FILES = \ TypesCheck.idl \ DataStreamComponent.idl \ SIGNALSComponent.idl \ - UndefinedSymbolComponent.idl \ - Calculator.idl + UndefinedSymbolComponent.idl BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) @@ -60,8 +59,7 @@ BASEIDL_SOURCES =\ TypesCheckSK.cc \ DataStreamComponentSK.cc \ SIGNALSComponentSK.cc \ - UndefinedSymbolComponentSK.cc \ - CalculatorSK.cc + UndefinedSymbolComponentSK.cc DYNIDL_SOURCES = \ AddComponentDynSK.cc \ AdditionComponentDynSK.cc \ @@ -74,8 +72,7 @@ DYNIDL_SOURCES = \ TypesCheckDynSK.cc \ DataStreamComponentDynSK.cc \ SIGNALSComponentDynSK.cc \ - UndefinedSymbolComponentDynSK.cc \ - CalculatorDynSK.cc + UndefinedSymbolComponentDynSK.cc nodist_libSalomeIDLCOMPONENT_la_SOURCES = ${BASEIDL_SOURCES} ${DYNIDL_SOURCES} ${DYNIDL_SOURCES}: ${BASEIDL_SOURCES} @@ -85,7 +82,6 @@ nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) libSalomeIDLCOMPONENT_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ \ @CORBA_INCLUDES@ @@ -93,7 +89,6 @@ libSalomeIDLCOMPONENT_la_CPPFLAGS = \ libSalomeIDLCOMPONENT_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeIDLCOMPONENT_la_LIBADD = \ $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ - $(MED_LDFLAGS) -lSalomeIDLMED \ @CORBA_LIBS@ # These variables defines the building process of CORBA files @@ -102,19 +97,16 @@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ OMNIORB_IDLPYFLAGS = \ @OMNIORB_IDLPYFLAGS@ \ -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(MED_ROOT_DIR)/idl/salome + -I$(KERNEL_ROOT_DIR)/idl/salome IDLCXXFLAGS = \ -bcxx \ @IDLCXXFLAGS@ \ -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(MED_ROOT_DIR)/idl/salome + -I$(KERNEL_ROOT_DIR)/idl/salome IDLPYFLAGS = \ @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(MED_ROOT_DIR)/idl/salome + -I$(KERNEL_ROOT_DIR)/idl/salome # potential problem on parallel make on the following - multiple outputs SUFFIXES = .idl .hh SK.cc @@ -151,7 +143,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$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ sed 's/\.o/\SK.cc/' >>$@; \ fi; \ done ; diff --git a/resources/COMPONENTCatalog.xml.in b/resources/COMPONENTCatalog.xml.in index 858575a..eab95fe 100644 --- a/resources/COMPONENTCatalog.xml.in +++ b/resources/COMPONENTCatalog.xml.in @@ -2130,159 +2130,6 @@ - - - Calculator - Calculator - SOLVER - LD - @VERSION@ - SuperVision test: Arithmetic operations with MED_Field - 0 - 1 - hostname = localhost - - - Calculator - No comment - - - - - Mul - LD - 1.0 - Multiplication of 2 fields of double - 1 - - - - SALOME_MED/FIELDDOUBLE - field1 - initial field of double - - - double - x1 - multiplicator - - - - - SALOME_MED/FIELDDOUBLE - return - result - - - - - - Add - LD - 1.0 - Addition of 2 fields of double - 1 - - - - SALOME_MED/FIELDDOUBLE - field1 - first field of double - - - SALOME_MED/FIELDDOUBLE - field2 - second field of double - - - - - SALOME_MED/FIELDDOUBLE - return - result - - - - - - Constant - LD - 1.0 - Build a constant field of doubles - 1 - - - - SALOME_MED/FIELDDOUBLE - field1 - allows to build the support - - - double - x1 - the constant - - - - - SALOME_MED/FIELDDOUBLE - return - result based on first field support - - - - - - PutToStudy - mpv - 1.0 - Put field to the study stucture - 1 - - - - SALOME_MED/FIELDDOUBLE - field1 - field to put to study - - - long - StudyId - the ID of the study - - - - - SALOME_MED/FIELDDOUBLE - return - the same field like in input - - - - - - writeMEDfile - LD - 1.0 - write a field in a Med file - 1 - - - - SALOME_MED/FIELDDOUBLE - field1 - transient Med field - - - string - filename - Med filename - - - - - - DataStreamFactory DataStreamFactory -- 2.39.2