From: smh <smh@opencascade.com>
Date: Tue, 18 Oct 2005 14:41:55 +0000 (+0000)
Subject: Preparation of 3.1.0a2 - compilation with HEAD of KERNEL (new LifeCycle)
X-Git-Tag: BR-D5-38-2003_D2005-12-19~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=621c13704dbeba2822e0c49f09df571e80baa200;p=modules%2Fgui.git

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

diff --git a/bin/VERSION b/bin/VERSION
index a428610ad..4476d06da 100755
--- 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 76811e733..aa0a8550e 100755
--- 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 a97a1583b..481b00ef1 100755
--- 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 369a244c0..990cf2957 100755
--- 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 7acf9fb58..fa2e1ee21 100755
--- 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