Preparation of 3.1.0a2 - compilation with HEAD of KERNEL (new LifeCycle)

diff --git a/bin/VERSION b/bin/VERSION
index a428610ad44c9e04993e1affc19cbd2e4a355e1a..4476d06daacc58ab4b9ea555903c8472c932c9c4 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - SALOMEGUI VERSION: 3.1.0a
+THIS IS SALOME - SALOMEGUI VERSION: 3.1.0a2

diff --git a/src/RegistryDisplay/Makefile.in b/src/RegistryDisplay/Makefile.in
index 76811e7332cdc988664f2bb33053010c0090eded..aa0a8550ef2d853a12a8c099feeb476abda666bf 100755 (executable)
--- a/src/RegistryDisplay/Makefile.in
+++ b/src/RegistryDisplay/Makefile.in
@@ -50,7 +50,7 @@ LIB_SRC = HelpWindow.cxx \
 
 LIB_MOC = RegWidget.h
 
-LIB_CLIENT_IDL = SALOME_Registry.idl
+LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
 
 CPPFLAGS+=$(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index a97a1583b22f7b22111cd9f9351020eca7dffb63..481b00ef175010cd200b726b666ed5c313ea07dc 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -63,7 +63,7 @@ CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLA
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
 LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_LDPATH) -lTKernel
 
-LDFLAGSFORBIN= $(LDFLAGS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification
+LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification
 
 @CONCLUDE@
 

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 369a244c0436f73409d56bf20be159843659792a..990cf2957b24ae3b010f859de6a2a8b88c23c1cb 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -279,7 +279,6 @@ int main( int argc, char **argv )
   SUIT_Session* aGUISession = 0;
   SALOME_NamingService* _NS = 0;
   GetInterfaceThread* guiThread = 0;
-  SALOMETraceCollector* myThreadTrace = 0;
   Session_ServerLauncher* myServerLauncher = 0;
 
   try {
@@ -305,7 +304,6 @@ int main( int argc, char **argv )
     ASSERT( SINGLETON_<ORB_INIT>::IsAlreadyExisting() );
     int orbArgc = 1;
     orb = init( orbArgc, argv );
-    myThreadTrace = SALOMETraceCollector::instance( orb );
 
     // Install SALOME thread event handler
     SALOME_Event::GetSessionThread();
@@ -439,7 +437,9 @@ int main( int argc, char **argv )
   delete guiThread;
   delete myServerLauncher;
   delete _NS;
-  delete myThreadTrace;
+
+  LocalTraceBufferPool *bp1 = LocalTraceBufferPool::instance();
+  LocalTraceBufferPool::deleteInstance(bp1);
 
   return result;
 }

diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in
index 7acf9fb5802d37ce579a7f154d6dcc8df10b9ccc..fa2e1ee217f5310eb20236ccf266717848d3c45a 100755 (executable)
--- a/src/TOOLSGUI/Makefile.in
+++ b/src/TOOLSGUI/Makefile.in
@@ -55,7 +55,7 @@ LIB_SRC = ToolsGUI_CatalogGeneratorDlg.cxx \
 LIB_MOC = ToolsGUI_CatalogGeneratorDlg.h \
           ToolsGUI_RegWidget.h
 
-LIB_CLIENT_IDL = SALOME_Registry.idl
+LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
 
 CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome