PR: synchro V7_main tag mergefrom_V6_main_11Feb13

diff --git a/configure.ac b/configure.ac
index a949b25d1ed55c783b09f09b9a19cb3f28d8583e..98147ad5870864b28081da3d3db898c7e81c1e55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #

-AC_INIT([Salome2 Project SMESH module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_INIT([Salome2 Project SMESH module], [7.0.0], [webmaster.salome@opencascade.com], [SalomeSMESH])

 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET

diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index c284b0b3ca8f3e7315eaa5eb97360d222c57931c..4d9a984d6aef9d8ebc3bad6b7482920ee57477fd 100644 (file)
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.cxx
@@ -357,9 +357,9 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
   string aValue = aStr.str();
   // PAL19785,0019867 - med forbids whitespace to be the last char in the name
   int maxSize;
   string aValue = aStr.str();
   // PAL19785,0019867 - med forbids whitespace to be the last char in the name
   int maxSize;

-  if ( theWrapper->GetVersion() == MED::eV2_1 )
-    maxSize = MED::GetNOMLength<MED::eV2_1>();
-  else
+  //if ( theWrapper->GetVersion() == MED::eV2_1 )
+  //  maxSize = MED::GetNOMLength<MED::eV2_1>();
+  //else

     maxSize = MED::GetNOMLength<MED::eV2_2>();
   int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
   while ( isspace( aValue[ lastCharPos ] ))
     maxSize = MED::GetNOMLength<MED::eV2_2>();
   int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
   while ( isspace( aValue[ lastCharPos ] ))

diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am
index 7a20cbd9304f894e8f618c59505b767cf79864e4..db0fa90b273f2f149aee53cd40ba456979cde2ce 100644 (file)
--- a/src/DriverMED/Makefile.am
+++ b/src/DriverMED/Makefile.am
@@ -15,15 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

-#

 
 #  SMESH DriverMED : driver to read and write 'med' files
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SMESH
 
 #  SMESH DriverMED : driver to read and write 'med' files
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SMESH

-#  $Header$
-#
+

 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 


@@ -63,10 +61,9 @@ libMeshDriverMED_la_CPPFLAGS = \
 libMeshDriverMED_la_LDFLAGS  = \
        $(BOOST_LIBS) \
        ../Driver/libMeshDriver.la \
 libMeshDriverMED_la_LDFLAGS  = \
        $(BOOST_LIBS) \
        ../Driver/libMeshDriver.la \

-       $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
+       $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2

        $(BOOST_LIB_SYSTEM) 
 
        $(BOOST_LIB_SYSTEM) 
 

-

 MED_Test_CPPFLAGS = \
        $(libMeshDriverMED_la_CPPFLAGS)
 
 MED_Test_CPPFLAGS = \
        $(libMeshDriverMED_la_CPPFLAGS)
 


@@ -75,6 +72,7 @@ MED_Test_LDADD = \
        ../Driver/libMeshDriver.la \
        ../SMDS/libSMDS.la \
        ../SMESHDS/libSMESHDS.la \
        ../Driver/libMeshDriver.la \
        ../SMDS/libSMDS.la \
        ../SMESHDS/libSMESHDS.la \

+       ${BOOST_LIB_SYSTEM} \

        $(KERNEL_LDFLAGS) \
        -lOpUtil \
        -lSALOMELocalTrace \
        $(KERNEL_LDFLAGS) \
        -lOpUtil \
        -lSALOMELocalTrace \


@@ -82,7 +80,5 @@ MED_Test_LDADD = \
        $(MED_LDFLAGS) \
        -lMEDWrapper \
        -lMEDWrapperBase \
        $(MED_LDFLAGS) \
        -lMEDWrapper \
        -lMEDWrapperBase \

-       -lMEDWrapper_V2_2 \
-       -lMEDWrapper_V2_1 \     
+       -lMEDWrapper_V2_2

        $(BOOST_LIB_SYSTEM) 
        $(BOOST_LIB_SYSTEM) 

-

diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am
index e75d9e4d7bf6756fa941b3725b2e800a28e35dbc..7e3902eecefd5965e95426fe31630d3eeca23184 100644 (file)
--- a/src/SMESHClient/Makefile.am
+++ b/src/SMESHClient/Makefile.am
@@ -15,14 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com

-#

 
 #  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 #  File   : Makefile.in
 #  Author : Pavel TELKOV (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SHESM
 
 #  GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
 #  File   : Makefile.in
 #  Author : Pavel TELKOV (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SHESM

-#
+

 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 


@@ -70,7 +69,7 @@ libSMESHClient_la_LDFLAGS  = \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
        -lSalomeIDLKernel -lSALOMELocalTrace \
        $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
        -lSalomeIDLKernel -lSALOMELocalTrace \
        $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \

-       $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \
+       $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \

        $(CAS_KERNEL)
 
 SMESHClientBin_CPPFLAGS = \
        $(CAS_KERNEL)
 
 SMESHClientBin_CPPFLAGS = \