From bdc2eedf20845a4cd03985e0c06d167f613abaca Mon Sep 17 00:00:00 2001 From: nri Date: Wed, 9 Jul 2003 15:39:43 +0000 Subject: [PATCH] NRI : Merge from V1_2. --- src/Loader/InquireServersQThread.cxx | 106 ++++++++---------- src/Loader/InquireServersQThread.h | 16 +-- src/Loader/Makefile.in | 18 ++- .../SALOME_ModuleCatalog_Acomponent_impl.cxx | 36 ++++-- .../SALOME_ModuleCatalog_Acomponent_impl.hxx | 34 ++++-- .../SALOME_ModuleCatalog_Handler.cxx | 37 ++++-- .../SALOME_ModuleCatalog_Handler.hxx | 33 +++++- .../SALOME_ModuleCatalog_Parser.hxx | 33 +++++- .../SALOME_ModuleCatalog_impl.cxx | 35 ++++-- src/RegistryDisplay/RegWidget.cxx | 38 +++++-- src/SALOMEDS/Makefile.in | 37 ++++-- 11 files changed, 283 insertions(+), 140 deletions(-) diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx index 39a7580d5..7e8cf6e42 100644 --- a/src/Loader/InquireServersQThread.cxx +++ b/src/Loader/InquireServersQThread.cxx @@ -1,14 +1,13 @@ -//============================================================================= -// File : InquireServersQThread.cxx -// Created : Mon Oct 21 17:26:42 2002 -// Author : Vasily RUSYAEV -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// Copyright (C) 2003 CEA/DEN, EDF R&D +// +// +// +// File : InquireServersQThread.cxx +// Author : Vasily RUSYAEV +// Module : SALOME +// $Header$ using namespace std; - #include "InquireServersQThread.h" #include @@ -216,12 +215,12 @@ InquireServersQThread::InquireServersQThread( InquireServersGUI* r ) QString str = "Loading: "; myMessages[0] = "Checking naming service..."; myMessages[1] = str + "SALOME_Registry_Server" + "..."; - myMessages[2] = str + "SALOMEDS_Server" + "..."; + myMessages[2] = str + "SALOME_Container SuperVisionContainer" + "..."; myMessages[3] = str + "SALOME_ModuleCatalog_Server" + "..."; - myMessages[4] = str + "SALOME_Session_Server" + "..."; - myMessages[5] = ""; - myMessages[6] = ""; - myMessages[7] = ""; + myMessages[4] = str + "SALOME_ContainerPy.py FactoryServerPy" + "..."; + myMessages[5] = str + "SALOME_Container FactoryServer" + "..."; + myMessages[6] = str + "SALOMEDS_Server" + "..."; + myMessages[7] = str + "SALOME_Session_Server" + "..."; r->getArgs( _argc, &_argv); @@ -328,17 +327,19 @@ bool InquireServersQThread::AskServer(int iteration, QString ** errMessage) case 2: //checking - existence of SALOME_Registry_Server case 3: - //checking - existence of SALOMEDS_Server + //checking - existence of SALOME_Container SuperVisionContainer case 4: //checking - existence of SALOME_ModuleCatalog_Server case 5: - //checking - existence of SALOME_Session_Server + //checking - existence of SALOME_ContainerPy.py FactoryServerPy case 6: //checking - existence of SALOME_Container FactoryServer case 7: - //checking - existence of SALOME_ContainerPy.py FactoryServerPy + //checking - existence of SALOMEDS_Server case 8: - //checking - existence of SALOME_Container SuperVisionContainer + //checking - existence of SALOME_Session_Server + + IsPassed = pingServer(iteration, errDescription); if (!IsPassed) *errMessage = new QString(errDescription); @@ -376,16 +377,20 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage) } } break; - case 3: - { - CORBA::Object_var obj = NS.Resolve("/myStudyManager"); - SALOMEDS::StudyManager_var studyManager = SALOMEDS::StudyManager::_narrow(obj) ; - if (!CORBA::is_nil(studyManager)) + case 3: + { + string hostname = GetHostname(); + string containerName = "/Containers/"; + containerName += hostname; + containerName += "/SuperVisionContainer"; + + CORBA::Object_var obj = NS.Resolve(containerName.c_str()); + Engines::Container_var SVcontainer = Engines::Container::_narrow(obj) ; + if (!CORBA::is_nil(SVcontainer)) { - MESSAGE("/myStudyManager is found"); - studyManager->ping(); + SVcontainer->ping(); result = true; - MESSAGE("StudyManager was activated"); + MESSAGE("SuperVisionContainer container was activated"); return result; } } @@ -404,7 +409,7 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage) } } break; - case 5: + case 8: { CORBA::Object_var obj = NS.Resolve("Kernel/Session"); SALOME::Session_var session = SALOME::Session::_narrow(obj) ; @@ -436,7 +441,7 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage) } } break; - case 7: + case 5: { string hostname = GetHostname(); string containerName = "/Containers/"; @@ -454,20 +459,16 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage) } } break; - case 8: - { - string hostname = GetHostname(); - string containerName = "/Containers/"; - containerName += hostname; - containerName += "/SuperVisionContainer"; - - CORBA::Object_var obj = NS.Resolve(containerName.c_str()); - Engines::Container_var SVcontainer = Engines::Container::_narrow(obj) ; - if (!CORBA::is_nil(SVcontainer)) + case 7: + { + CORBA::Object_var obj = NS.Resolve("/myStudyManager"); + SALOMEDS::StudyManager_var studyManager = SALOMEDS::StudyManager::_narrow(obj) ; + if (!CORBA::is_nil(studyManager)) { - SVcontainer->ping(); + MESSAGE("/myStudyManager is found"); + studyManager->ping(); result = true; - MESSAGE("SuperVisionContainer container was activated"); + MESSAGE("StudyManager was activated"); return result; } } @@ -509,22 +510,22 @@ bool InquireServersQThread::pingServer(int iteration, QString& errMessage) case 2: serverName = "SALOME_Registry_Server is not loaded. "; break; - case 3: + case 7: serverName = "SALOMEDS_Server is not loaded. "; break; case 4: serverName = "SALOME_ModuleCatalog_Server is not loaded. "; break; - case 5: + case 8: serverName = "SALOME_Session_Server is not loaded. "; break; case 6: serverName = "SALOME_Container FactoryServer is not loaded. "; break; - case 7: + case 5: serverName = "SALOME_ContainerPy.py FactoryServerPy is not loaded. "; break; - case 8: + case 3: serverName = "SALOME_Container SuperVisionContainer is not loaded. "; break; } @@ -540,23 +541,6 @@ QString findFile( QString filename ) QString dir; char* cenv; - // Try ${SALOME_ROOT_DIR}/share/salome/resources directory - cenv = getenv( "KERNEL_ROOT_DIR" ); - if ( cenv ) { - dir.sprintf( "%s", cenv ); - if ( !dir.isEmpty() ) { - dir = addSlash(dir) ; - dir = dir + "share" ; - dir = addSlash(dir) ; - dir = dir + "salome" ; - dir = addSlash(dir) ; - dir = dir + "resources" ; - dir = addSlash(dir) ; - QFileInfo fileInfo( dir + filename ); - if ( fileInfo.isFile() && fileInfo.exists() ) - return fileInfo.filePath(); - } - } // Try CSF_ResourcesDefaults env.var directory ( or directory list ) cenv = getenv( "CSF_ResourcesDefaults" ); if ( cenv ) { diff --git a/src/Loader/InquireServersQThread.h b/src/Loader/InquireServersQThread.h index 1a1a74c1e..a9efd61d9 100644 --- a/src/Loader/InquireServersQThread.h +++ b/src/Loader/InquireServersQThread.h @@ -1,11 +1,11 @@ -//============================================================================= -// File : InquireServersQThread.h -// Created : Mon Oct 21 17:26:42 2002 -// Author : Vasily RUSYAEV -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// Copyright (C) 2003 CEA/DEN, EDF R&D +// +// +// +// File : InquireServersQThread.h +// Author : Vasily RUSYAEV +// Module : SALOME +// $Header$ #include #include diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in index ec05f0465..dd736d4ed 100644 --- a/src/Loader/Makefile.in +++ b/src/Loader/Makefile.in @@ -1,13 +1,12 @@ -#============================================================================== -# File : Makefile.in -# Created : mar jui 3 12:59:20 CEST 2001 -# Author : Paul RASCLE, EDF -# Project : SALOME -# Copyright : EDF 2001 +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# +# +# File : Makefile.in +# Author : Paul RASCLE, EDF +# Module : SALOME # $Header$ -#============================================================================== -# source path top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ @@ -28,8 +27,7 @@ BIN_CLIENT_IDL = SALOME_Session.idl \ SALOME_Component.idl \ SALOME_ModuleCatalog.idl \ SALOME_Registry.idl \ - SALOME_Exception.idl - + SALOME_Exception.idl CPPFLAGS+=$(QT_MT_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx index 65476af91..35e5c2e3e 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx @@ -1,12 +1,32 @@ -using namespace std; -// File: SALOME_ModuleCatalog_Acomponent_impl.cxx -// Created: Tue June 28 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ - +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_Acomponent_impl.cxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ +using namespace std; #include "SALOME_ModuleCatalog_Acomponent_impl.hxx" //---------------------------------------------------------------------- diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx index 3cbde7fd7..0a7c715d5 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx @@ -1,10 +1,30 @@ -// File: SALOME_ModuleCatalog_Acomponent_impl.hxx -// Created: Tue June 28 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ - +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_Acomponent_impl.hxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ #ifndef ACOMPONENT_IMPL_H #define ACOMPONENT_IMPL_H diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx index f22bf8ce0..8f8f0e241 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx @@ -1,11 +1,32 @@ -using namespace std; -// File: SALOME_ModuleCatalog_Handler.cxx -// Created: Tue June 27 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_Handler.cxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ +using namespace std; #define WRITE_CATA_COMPONENT #include "SALOME_ModuleCatalog_Handler.hxx" @@ -296,7 +317,7 @@ bool SALOME_ModuleCatalog_Handler::endElement(const QString&, //---------------------------------------------------------------------- bool SALOME_ModuleCatalog_Handler::characters(const QString& chars) { - content = chars ; + content = (const char*)chars ; return true; } diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx index be38d6364..c12c49cef 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx @@ -1,9 +1,30 @@ -// File: SALOME_ModuleCatalog_Handler.hxx -// Created: Tue June 27 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_Handler.hxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ #ifndef SALOME_CATALOG_HANDLER_H #define SALOME_CATALOG_HANDLER_H diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Parser.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Parser.hxx index d84a4ba5b..236763abb 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Parser.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Parser.hxx @@ -1,9 +1,30 @@ -// File: SALOME_ModuleCatalog_Parser.hxx -// Created: Tue June 25 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_Parser.hxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ #ifndef SALOME_CATALOG_PARSER_H #define SALOME_CATALOG_PARSER_H diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx index ba6ff0a51..9f912a7d3 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx @@ -1,11 +1,32 @@ -using namespace std; -// File: SALOME_ModuleCatalog_impl.cxx -// Created: Tue June 28 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ +// SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_ModuleCatalog_impl.cxx +// Author : Estelle Deville +// Module : SALOME +// $Header$ +using namespace std; #include "SALOME_ModuleCatalog_impl.hxx" #include "SALOME_ModuleCatalog_Acomponent_impl.hxx" #include diff --git a/src/RegistryDisplay/RegWidget.cxx b/src/RegistryDisplay/RegWidget.cxx index 5ca42e7d7..9110ca423 100644 --- a/src/RegistryDisplay/RegWidget.cxx +++ b/src/RegistryDisplay/RegWidget.cxx @@ -1,14 +1,32 @@ -using namespace std; -//============================================================================= -// File : RegWidget.cxx -// Created : Mon Nov 5 17:26:23 CET 2001 -// Author : Pascale NOYRET, EDF -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= - +// SALOME RegistryDisplay : GUI for Registry server implementation +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : RegWidget.cxx +// Author : Pascale NOYRET, EDF +// Module : SALOME +// $Header$ +using namespace std; # include # include # include diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in index b0a5ff01d..429bf63e5 100644 --- a/src/SALOMEDS/Makefile.in +++ b/src/SALOMEDS/Makefile.in @@ -1,9 +1,30 @@ -#============================================================================== -# File : Makefile.in -# Author : Marc Tajchman -#============================================================================== +# SALOME SALOMEDS : data structure of SALOME and sources of Salome data server +# +# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : Makefile.in +# Author : Marc Tajchman +# Module : SALOME -# source path top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ @@ -12,7 +33,6 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl @COMMENCE@ -EXPORT_HEADERS = SALOMEDS_Tool.hxx # Libraries targets @@ -21,7 +41,6 @@ LIB_SRC = \ SALOMEDS_StudyManager_i.cxx \ SALOMEDS_UseCaseBuilder_i.cxx \ SALOMEDS_UseCaseIterator_i.cxx \ - SALOMEDS_Tool.cxx \ SALOMEDS_ChildIterator_i.cxx \ SALOMEDS_SComponentIterator_i.cxx \ SALOMEDS_Study_i.cxx \ @@ -77,7 +96,7 @@ LIB_SRC = \ SALOMEDS_DataMapNodeOfDataMapOfIntegerString_0.cxx \ SALOMEDS_DataMapIteratorOfDataMapStringLabel_0.cxx \ SALOMEDS_DataMapNodeOfDataMapStringLabel_0.cxx \ - SALOMEDS_DataMapStringLabel_0.cxx + SALOMEDS_DataMapStringLabel_0.cxx # Executables targets BIN = SALOMEDS_Server SALOMEDS_Client @@ -88,7 +107,7 @@ BIN_CLIENT_IDL = CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+=$(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) $(OGL_LIBS) $(HDF5_LIBS) -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer +LDFLAGS+=$(CAS_KERNEL) $(CAS_OCAF) $(CAS_VIEWER) $(CAS_MODELER) $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer # -L/opt/ccmalloc/lib -lccmalloc -ldl # -L/opt/efence/lib -lefence -- 2.39.2