From: smh <smh@opencascade.com>
Date: Tue, 18 Oct 2005 14:47:34 +0000 (+0000)
Subject: Preparation of 3.1.0a2:
X-Git-Tag: ForTest_3_1_0a2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7a029406420730a8a7ed19264f9f47c8ff92293d;p=modules%2Fmed.git

Preparation of 3.1.0a2:
1. compilation with HEAD of KERNEL (new LifeCycle)
2. Achive of compilation of different platforms
3. Modification of MED_WIHOUT_KERNEL define due to conflicts with utilities.h in MED module clients (like Conponent/Calculator)
---

diff --git a/bin/VERSION b/bin/VERSION
index 851d79cab..5b24a5e54 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - MED VERSION: 3.0.3
+THIS IS SALOME - MED VERSION: 3.1.0a2
diff --git a/configure.in.base b/configure.in.base
index e4a04d6af..3e5907939 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -236,7 +236,7 @@ CHECK_MED2
 
 if test "${MED_WITH_KERNEL}" == "yes"; then
 {
-CPPFLAGS="$CPPFLAGS -DMED_WITH_KERNEL"
+#CPPFLAGS="$CPPFLAGS -DMED_WITH_KERNEL"
 
 dnl echo
 dnl echo ---------------------------------------------
@@ -353,6 +353,7 @@ else
 {
   WITHIHM=""
   AC_SUBST(WITHIHM)
+  CPPFLAGS="$CPPFLAGS -DMED_WITHOUT_KERNEL"
 }
 fi # MED_WITH_KERNEL
 
diff --git a/src/INTERPOLATION/Makefile.in b/src/INTERPOLATION/Makefile.in
index 2ab4fb40d..250f2a56a 100644
--- a/src/INTERPOLATION/Makefile.in
+++ b/src/INTERPOLATION/Makefile.in
@@ -85,7 +85,7 @@ CXXFLAGS+=-U_DEBUG_ @CXXTMPDPTHFLAGS@
 LDFLAGS+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1
 
 #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem
-LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase -lSALOMEBasics
 
 ifeq ($(MED_WITH_KERNEL),yes)
   CPPFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome
diff --git a/src/MEDMEM/MEDMEM_Init.cxx b/src/MEDMEM/MEDMEM_Init.cxx
index eef85f3a7..3514fb9d3 100644
--- a/src/MEDMEM/MEDMEM_Init.cxx
+++ b/src/MEDMEM/MEDMEM_Init.cxx
@@ -1,5 +1,5 @@
 #  ifdef MED_WITH_KERNEL
-#include "LocalTraceCollector.hxx"
+//#include "LocalTraceCollector.hxx"
 #  endif /* ifdef MED_WITH_KERNEL*/
 
 namespace MEDMEM
@@ -16,6 +16,6 @@ MEDMEM::INIT init;
 MEDMEM::INIT::INIT()
 {
 #ifdef MED_WITH_KERNEL
-  LocalTraceCollector::instance();
+//  LocalTraceCollector::instance();
 #endif /* ifdef MED_WITH_KERNEL*/
 }
diff --git a/src/MEDMEM/MEDMEM_Utilities.hxx b/src/MEDMEM/MEDMEM_Utilities.hxx
index 95580ba4f..c7e34eefa 100644
--- a/src/MEDMEM/MEDMEM_Utilities.hxx
+++ b/src/MEDMEM/MEDMEM_Utilities.hxx
@@ -1,87 +1,86 @@
-#ifndef __MEDMEM_UTILITIES
-#define __MEDMEM_UTILITIES
-
-#ifdef MED_WITH_KERNEL
-// #ifdef _SALOME
-
-#  include <utilities.h>
-
-#else
-
-#  include <cstdlib>
-#  include <iostream>
-using namespace std;
-
-/* ---  INFOS is always defined (without _DEBUG_): to be used for warnings, with release version --- */
-
-# define HEREWEARE {cout<<flush ; cerr << __FILE__ << " [" << __LINE__ << "] : " << flush ;}
-# define INFOS(chain) {HEREWEARE ; cerr << chain << endl ;}
-# define PYSCRIPT(chain) {cout<<flush ; cerr << "---PYSCRIPT--- " << chain << endl ;}
-
-
-/* --- To print date and time of compilation of current source on stdout --- */
-
-# if defined ( __GNUC__ )
-# define COMPILER		"g++" ;
-# elif defined ( __sun )
-# define COMPILER		"CC" ;
-# elif defined ( __KCC )
-# define COMPILER		"KCC" ;
-# elif defined ( __PGI )
-# define COMPILER		"pgCC" ;
-# else
-# define COMPILER		"undefined" ;
-# endif
-
-# ifdef INFOS_COMPILATION
-# undef INFOS_COMPILATION
-# endif
-# define INFOS_COMPILATION	{\
-					cerr << flush;\
-					cout << __FILE__ ;\
-					cout << " [" << __LINE__ << "] : " ;\
-					cout << "COMPILED with " << COMPILER ;\
-					cout << ", " << __DATE__ ; \
-					cout << " at " << __TIME__ << endl ;\
-					cout << "\n\n" ;\
-					cout << flush ;\
-				}
-
-# ifdef _DEBUG_
-
-/* --- the following MACROS are useful at debug time --- */
-
-# define HERE {cout<<flush ; cerr << "- Trace " << __FILE__ << " [" << __LINE__ << "] : " << flush ;}
-# define SCRUTE(var) {HERE ; cerr << #var << "=" << var << endl ;}
-# define MESSAGE(chain) {HERE ; cerr << chain << endl ;}
-# define INTERRUPTION(code) {HERE ; cerr << "INTERRUPTION return code= " << code << endl ; exit(code) ;}
-
-# ifndef ASSERT
-# define ASSERT(condition) if (!(condition)){ HERE ; cerr << "CONDITION " << #condition << " NOT VERIFIED"<< endl ; INTERRUPTION(1) ;}
-# endif /* ASSERT */
-
-#define REPERE {cout<<flush ; cerr << "   --------------" << endl << flush ;}
-#define BEGIN_OF(chain) {REPERE ; HERE ; cerr << "Begin of: " << chain << endl ; REPERE ; }
-#define END_OF(chain) {REPERE ; HERE ; cerr << "Normal end of: " << chain << endl ; REPERE ; }
-
-
-
-# else /* ifdef _DEBUG_*/
-
-# define HERE
-# define SCRUTE(var) {}
-# define MESSAGE(chain) {}
-# define INTERRUPTION(code) {}
-
-# ifndef ASSERT
-# define ASSERT(condition) {}
-# endif /* ASSERT */
-
-#define REPERE
-#define BEGIN_OF(chain) {}
-#define END_OF(chain) {}
-
-#endif
-
-#endif
-#endif
+#ifndef __MEDMEM_UTILITIES
+#define __MEDMEM_UTILITIES
+
+#ifdef MED_WITHOUT_KERNEL
+
+#  include <cstdlib>
+#  include <iostream>
+using namespace std;
+
+/* ---  INFOS is always defined (without _DEBUG_): to be used for warnings, with release version --- */
+
+# define HEREWEARE {cout<<flush ; cerr << __FILE__ << " [" << __LINE__ << "] : " << flush ;}
+# define INFOS(chain) {HEREWEARE ; cerr << chain << endl ;}
+# define PYSCRIPT(chain) {cout<<flush ; cerr << "---PYSCRIPT--- " << chain << endl ;}
+
+
+/* --- To print date and time of compilation of current source on stdout --- */
+
+# if defined ( __GNUC__ )
+# define COMPILER		"g++" ;
+# elif defined ( __sun )
+# define COMPILER		"CC" ;
+# elif defined ( __KCC )
+# define COMPILER		"KCC" ;
+# elif defined ( __PGI )
+# define COMPILER		"pgCC" ;
+# else
+# define COMPILER		"undefined" ;
+# endif
+
+# ifdef INFOS_COMPILATION
+# undef INFOS_COMPILATION
+# endif
+# define INFOS_COMPILATION	{\
+					cerr << flush;\
+					cout << __FILE__ ;\
+					cout << " [" << __LINE__ << "] : " ;\
+					cout << "COMPILED with " << COMPILER ;\
+					cout << ", " << __DATE__ ; \
+					cout << " at " << __TIME__ << endl ;\
+					cout << "\n\n" ;\
+					cout << flush ;\
+				}
+
+# ifdef _DEBUG_
+
+/* --- the following MACROS are useful at debug time --- */
+
+# define HERE {cout<<flush ; cerr << "- Trace " << __FILE__ << " [" << __LINE__ << "] : " << flush ;}
+# define SCRUTE(var) {HERE ; cerr << #var << "=" << var << endl ;}
+# define MESSAGE(chain) {HERE ; cerr << chain << endl ;}
+# define INTERRUPTION(code) {HERE ; cerr << "INTERRUPTION return code= " << code << endl ; exit(code) ;}
+
+# ifndef ASSERT
+# define ASSERT(condition) if (!(condition)){ HERE ; cerr << "CONDITION " << #condition << " NOT VERIFIED"<< endl ; INTERRUPTION(1) ;}
+# endif /* ASSERT */
+
+#define REPERE {cout<<flush ; cerr << "   --------------" << endl << flush ;}
+#define BEGIN_OF(chain) {REPERE ; HERE ; cerr << "Begin of: " << chain << endl ; REPERE ; }
+#define END_OF(chain) {REPERE ; HERE ; cerr << "Normal end of: " << chain << endl ; REPERE ; }
+
+
+
+# else /* ifdef _DEBUG_*/
+
+# define HERE
+# define SCRUTE(var) {}
+# define MESSAGE(chain) {}
+# define INTERRUPTION(code) {}
+
+# ifndef ASSERT
+# define ASSERT(condition) {}
+# endif /* ASSERT */
+
+#define REPERE
+#define BEGIN_OF(chain) {}
+#define END_OF(chain) {}
+
+#endif
+
+#else
+// #ifdef _SALOME
+
+#  include <utilities.h>
+#endif
+#endif
diff --git a/src/MEDMEM/Makefile.in b/src/MEDMEM/Makefile.in
index 032935c96..1f25a87fe 100644
--- a/src/MEDMEM/Makefile.in
+++ b/src/MEDMEM/Makefile.in
@@ -145,7 +145,7 @@ LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 $(STDLIB)
 
 #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS)
 # change motivated by the bug KERNEL4778.
-LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapper_V2_1 -lMEDWrapperBase -lSALOMEBasics
 
 ifeq ($(MED_WITH_KERNEL),yes)
   CPPFLAGS+= -I${KERNEL_ROOT_DIR}/include/salome
diff --git a/src/MEDWrapper/Factory/Makefile.in b/src/MEDWrapper/Factory/Makefile.in
index 2b1b97d4f..aa3878400 100644
--- a/src/MEDWrapper/Factory/Makefile.in
+++ b/src/MEDWrapper/Factory/Makefile.in
@@ -51,6 +51,6 @@ CPPFLAGS+= $(BOOST_CPPFLAGS) $(MED2_INCLUDES)
 
 LDFLAGS+= -lMEDWrapper_V2_2 -lMEDWrapper_V2_1
 
-LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapperBase
+LDFLAGSFORBIN=$(LDFLAGS) $(HDF5_LIBS) -lMEDWrapperBase
 
 @CONCLUDE@