From 97060564e8c11698c3ebcf15b261b2a452a2c57c Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 1 Dec 2004 10:54:31 +0000 Subject: [PATCH] Merge with version on tag OCC-V2_1_0d --- INSTALL | 4 +- bin/VERSION | 2 +- idl/AddComponent.idl | 1 + idl/DataStreamComponent.idl | 76 +++ idl/FactorialComponent.idl | 1 + idl/Makefile.in | 19 +- resources/COMPONENTCatalog.xml | 491 +++++++++++++++++- src/CalculatorComponent/CalculatorEngine.cxx | 12 +- .../DataStreamComponent_CheckOfUndefined.cxx | 37 ++ .../DataStreamComponent_Impl.cxx | 160 ++++++ .../DataStreamComponent_Impl.hxx | 106 ++++ src/DataStreamComponent/Makefile.in | 59 +++ src/Makefile.in | 2 +- 13 files changed, 953 insertions(+), 17 deletions(-) create mode 100644 idl/DataStreamComponent.idl create mode 100644 src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx create mode 100644 src/DataStreamComponent/DataStreamComponent_Impl.cxx create mode 100644 src/DataStreamComponent/DataStreamComponent_Impl.hxx create mode 100644 src/DataStreamComponent/Makefile.in diff --git a/INSTALL b/INSTALL index 3c6977b..d8d6f45 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,3 @@ -This is the version 2.0.0 of COMPONENT +This is the version 2.1.0 of COMPONENT Compatible with : - - KERNEL 2.0.0 + - KERNEL 2.1.0 diff --git a/bin/VERSION b/bin/VERSION index 7225be5..9af27a9 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - COMPONENT VERSION: 2.0.0 +THIS IS SALOME - COMPONENT VERSION: 2.1.0 diff --git a/idl/AddComponent.idl b/idl/AddComponent.idl index 08b8ab3..9806f9f 100644 --- a/idl/AddComponent.idl +++ b/idl/AddComponent.idl @@ -35,6 +35,7 @@ module SuperVisionTest { interface AddComponent : Engines::Component { Adder Addition() ; double Add( in double x , in double y , out double z ) ; + long Sigma( in long n ) ; double LastResult() ; }; diff --git a/idl/DataStreamComponent.idl b/idl/DataStreamComponent.idl new file mode 100644 index 0000000..ebbe279 --- /dev/null +++ b/idl/DataStreamComponent.idl @@ -0,0 +1,76 @@ +// 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 : DataStreamComponent.idl +// Author : Jean Rahuel +// $Header: + +#ifndef _DATASTREAMCOMPONENT_IDL +#define _DATASTREAMCOMPONENT_IDL + +#include "SALOME_Component.idl" + +module DataStreamComponent { + + interface DataStream ; + + interface DataStreamFactory : Engines::Component { + + // DataStreamPorts Setxy istream(INTEGER, in, T), ostream(INTEGER, out, T) + void Setxy( in long x , in long y ) ; + + void Getxy( out long x , out long y ) ; + + // DataStreamPorts Add istream(INTEGER, in, I), ostream(INTEGER, out, I), OStream(INTEGER, out, I ) + void Add( in long x , in long y , out long z ) ; + + // DataStreamPorts Sub istream(INTEGER, in, I), Istream(INTEGER, in, I) + void Sub( in long x , in long y , out long z ) ; + + void Mul( in long x , in long y , out long z ) ; + + // DataStreamPorts Div ostream(INTEGER, out, I) + void Div( in long x , in long y , out long z ) ; + + DataStream NewDataStream() ; + + }; + + interface DataStream : Engines::Component { + + // DataStreamPorts StreamSetxy istream(INTEGER, in, T), ostream(INTEGER, out, T) + void StreamSetxy( in long x , in long y ) ; + + void StreamGetxy( out long x , out long y ) ; + + // DataStreamPorts StreamAdd istream(INTEGER, in, I), ostream(INTEGER, out, I), OStream(INTEGER, out, I ) + void StreamAdd( in long x , in long y , out long z ) ; + // DataStreamPorts StreamSub istream(INTEGER, in, I), Istream(INTEGER, in, I) + void StreamSub( in long x , in long y , out long z ) ; + void StreamMul( in long x , in long y , out long z ) ; + // DataStreamPorts StreamDiv ostream(INTEGER, out, I) + void StreamDiv( in long x , in long y , out long z ) ; + + }; + +} ; + +#endif diff --git a/idl/FactorialComponent.idl b/idl/FactorialComponent.idl index 6ac4439..40a5351 100644 --- a/idl/FactorialComponent.idl +++ b/idl/FactorialComponent.idl @@ -29,6 +29,7 @@ module SuperVisionTest { interface FactorialComponent : Engines::Component { long eval(in long n); + long sigma( in long n ) ; }; }; diff --git a/idl/Makefile.in b/idl/Makefile.in index bf01242..c3289ca 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -11,15 +11,16 @@ VPATH=.:${KERNEL_ROOT_DIR}/idl/salome @COMMENCE@ IDL_FILES = \ - AddComponent.idl \ - MulComponent.idl \ - SyrControlComponent.idl \ - DivComponent.idl \ - SubComponent.idl \ - FactorialComponent.idl \ - SyrComponent.idl \ - TypesCheck.idl \ - Calculator.idl + AddComponent.idl \ + DivComponent.idl \ + FactorialComponent.idl \ + MulComponent.idl \ + SubComponent.idl \ + SyrComponent.idl \ + SyrControlComponent.idl \ + TypesCheck.idl \ + DataStreamComponent.idl \ + Calculator.idl PY_CLIENT_IDL = $(IDL_FILES) diff --git a/resources/COMPONENTCatalog.xml b/resources/COMPONENTCatalog.xml index 1a8488f..2639464 100644 --- a/resources/COMPONENTCatalog.xml +++ b/resources/COMPONENTCatalog.xml @@ -16,7 +16,7 @@ AddComponent SuperVisionTest MTJ - 1.0 + 2.1.0 Test SuperVision SALOME/src/SALOME_SWIG/supervisionexample[1].py 0 @@ -1507,5 +1507,494 @@ + + + + OTHER + jr + 1 + unknown + 1 + 1 + + + + DataStreamFactory + DataStreamFactory + OTHER + jr + 1 + unknown + 1 + + + + DataStreamFactory + unknown + + + Setxy + jr + 1 + unknown + 0 + + + x + long + unknown + + + y + long + unknown + + + + + + istream + INTEGER + unknown + T + + + ostream + INTEGER + unknown + T + + + + + Getxy + jr + 1 + unknown + 0 + + + + x + long + unknown + + + y + long + unknown + + + + + + Add + jr + 1 + unknown + 0 + + + x + long + unknown + + + y + long + unknown + + + + + z + long + unknown + + + + + istream + INTEGER + unknown + I + + + ostream + INTEGER + unknown + I + + + OStream + INTEGER + unknown + I + + + + + Sub + jr + 1 + unknown + 0 + + + x + long + unknown + + + y + long + unknown + + + + + z + long + unknown + + + + + istream + INTEGER + unknown + I + + + Istream + INTEGER + unknown + I + + + + + Mul + jr + 1 + unknown + 0 + + + x + long + unknown + + + y + long + unknown + + + + + z + long + unknown + + + + + + Div + jr + 1 + unknown + 0 + + + x + long + unknown + + + y + long + unknown + + + + + z + long + unknown + + + + + ostream + INTEGER + unknown + I + + + + + NewDataStream + jr + 1 + unknown + 0 + + + + DataStream + DataStream + unknown + + + + + + DataStream + unknown + + + StreamSetxy + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + long + x + unknown + + + long + y + unknown + + + + + + istream + INTEGER + unknown + T + + + ostream + INTEGER + unknown + T + + + + + StreamGetxy + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + + + long + x + unknown + + + long + y + unknown + + + + + + StreamAdd + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + long + x + unknown + + + long + y + unknown + + + + + long + z + unknown + + + + + istream + INTEGER + unknown + I + + + ostream + INTEGER + unknown + I + + + OStream + INTEGER + unknown + I + + + + + StreamSub + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + long + x + unknown + + + long + y + unknown + + + + + long + z + unknown + + + + + istream + INTEGER + unknown + I + + + Istream + INTEGER + unknown + I + + + + + StreamMul + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + long + x + unknown + + + long + y + unknown + + + + + long + z + unknown + + + + + + StreamDiv + jr + 1 + unknown + 0 + 1 + + + objref + this + unknown + + + long + x + unknown + + + long + y + unknown + + + + + long + z + unknown + + + + + ostream + INTEGER + unknown + I + + + + + + diff --git a/src/CalculatorComponent/CalculatorEngine.cxx b/src/CalculatorComponent/CalculatorEngine.cxx index d6503dd..cfe2555 100644 --- a/src/CalculatorComponent/CalculatorEngine.cxx +++ b/src/CalculatorComponent/CalculatorEngine.cxx @@ -278,7 +278,9 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Add(SALOME_MED::FIELDDOUBLE_ptr Fi MESSAGE("CalculatorEngine::Add Creation of the CORBA field"); - FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(support1,fieldloc) ; + // Corrected by APV - November 23, 2004 + // FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(support1,fieldloc) ; + FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(fieldloc) ; POA_SALOME_MED::FIELDDOUBLE_tie * myFieldTie = new POA_SALOME_MED::FIELDDOUBLE_tie(NewField) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = myFieldTie->_this() ; @@ -368,7 +370,9 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Mul(SALOME_MED::FIELDDOUBLE_ptr Ol MESSAGE("CalculatorEngine::Mul Creation of the CORBA field"); - FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(support,fieldloc) ; + // Corrected by APV - November 23, 2004 + // FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(support,fieldloc) ; + FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(fieldloc) ; POA_SALOME_MED::FIELDDOUBLE_tie * myFieldTie = new POA_SALOME_MED::FIELDDOUBLE_tie(NewField) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = myFieldTie->_this() ; @@ -459,7 +463,9 @@ SALOME_MED::FIELDDOUBLE_ptr CalculatorEngine::Constant(SALOME_MED::FIELDDOUBLE_p MESSAGE("CalculatorEngine::Constant Creation of the CORBA field"); - FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(FirstSupport,fieldloc) ; + // Corrected by APV - November 23, 2004 + // FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(FirstSupport,fieldloc) ; + FIELDDOUBLE_i * NewField = new FIELDDOUBLE_i(fieldloc) ; POA_SALOME_MED::FIELDDOUBLE_tie * myFieldTie = new POA_SALOME_MED::FIELDDOUBLE_tie(NewField) ; SALOME_MED::FIELDDOUBLE_ptr myFieldIOR = myFieldTie->_this() ; diff --git a/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx b/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx new file mode 100644 index 0000000..05cfb16 --- /dev/null +++ b/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx @@ -0,0 +1,37 @@ +// SuperVisionTest DataStreamComponent : example of component +// +// 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 : DataStreamComponent_CheckOfUndefined.cxx +// Module : SuperVisionTest + +using namespace std; +#include +#include +#include + +#include "DataStreamComponent_Impl.hxx" + +int main(int argc, char **argv) { + return 0; +} + diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.cxx b/src/DataStreamComponent/DataStreamComponent_Impl.cxx new file mode 100644 index 0000000..0cfff2a --- /dev/null +++ b/src/DataStreamComponent/DataStreamComponent_Impl.cxx @@ -0,0 +1,160 @@ +// SuperVisionTest DataStreamComponent : example +// +// 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 : DataStreamComponent_Impl.cxx +// Author : Jean Rahuel +// Module : SuperVisionTest + +using namespace std; +#include +#include +#include +#include +#include + +#include "DataStreamComponent_Impl.hxx" + +DataStreamFactory_Impl::DataStreamFactory_Impl( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,true) { + MESSAGE("DataStreamFactory_Impl::DataStreamFactory_Impl this " << hex << this << dec + << "activate object instanceName(" + << instanceName << ") interfaceName(" << interfaceName << ")" ) + _thisObj = this ; + _id = _poa->activate_object(_thisObj); +} + +DataStreamFactory_Impl::DataStreamFactory_Impl() { +} + +DataStreamFactory_Impl::~DataStreamFactory_Impl() { +} + +void DataStreamFactory_Impl::Setxy( const long x , const long y ) { + _x = x ; + _y = y ; +} + +void DataStreamFactory_Impl::Getxy( long & x , long & y ) { + x = _x ; + y = _y ; +} + +void DataStreamFactory_Impl::Add( const long x , const long y , long & z ) { + z = x+y ; +} +void DataStreamFactory_Impl::Sub( const long x , const long y , long & z ) { + z = x-y ; +} +void DataStreamFactory_Impl::Mul( const long x , const long y , long & z ) { + z = x*y ; +} +void DataStreamFactory_Impl::Div( const long x , const long y , long & z ) { + z = x/y ; +} + +DataStreamComponent::DataStream_ptr DataStreamFactory_Impl::NewDataStream() { + beginService( "DataStreamFactory_Impl::NewDataStream" ); + sendMessage(NOTIF_STEP, "DataStreamFactory_Impl creates DataStream_Impl"); + DataStream_Impl * myDataStream ; + myDataStream = new DataStream_Impl( _orb , _poa, _contId, + instanceName() , interfaceName() , + graphName() , nodeName() ) ; + DataStreamComponent::DataStream_var iobject ; + PortableServer::ObjectId * id = myDataStream->getId() ; + CORBA::Object_var obj = _poa->id_to_reference(*id); + iobject = DataStreamComponent::DataStream::_narrow(obj) ; + endService( "DataStreamFactory_Impl::NewDataStream" ); + return DataStreamComponent::DataStream::_duplicate(iobject) ; +} + +extern "C" +{ + PortableServer::ObjectId * DataStreamFactoryEngine_factory + (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) + { + MESSAGE("DataStreamFactoryEngine_factory DataStreamFactoryEngine (" + << instanceName << "," << interfaceName << "," << getpid() << ")"); + DataStreamFactory_Impl * myDataStreamFactory + = new DataStreamFactory_Impl(orb, poa, contId, instanceName, interfaceName); + return myDataStreamFactory->getId() ; + } +} + +DataStream_Impl::DataStream_Impl( CORBA::ORB_ptr orb , + PortableServer::POA_ptr poa , + PortableServer::ObjectId * contId , + const char * instanceName , + const char * interfaceName , + const char * graphName , + const char * nodeName ) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName,1,true) { + Names( graphName , nodeName ) ; + MESSAGE("DataStream_Impl::DataStream_Impl activate object instanceName(" + << instanceName << ") interfaceName(" << interfaceName << ") --> " + << hex << (void *) this << dec ) + beginService( "DataStream_Impl::DataStream_Impl" ); + _thisObj = this ; + _id = _poa->activate_object(_thisObj); + sendMessage(NOTIF_STEP, "DataStream_Impl is Created"); + endService( "DataStream_Impl::DataStream_Impl" ); +} + +DataStream_Impl::DataStream_Impl() { +} + +DataStream_Impl::~DataStream_Impl() { + beginService( "DataStream_Impl::~DataStream_Impl" ); + endService( "DataStream_Impl::~DataStream_Impl" ); +} + +void DataStream_Impl::StreamSetxy( const long x , const long y ) { + _x = x ; + _y = y ; +} + +void DataStream_Impl::StreamGetxy( long & x , long & y ) { + x = _x ; + y = _y ; +} + +void DataStream_Impl::StreamAdd( const long x , const long y , long & z ) { + z = x+y ; +} +void DataStream_Impl::StreamSub( const long x , const long y , long & z ) { + z = x-y ; +} +void DataStream_Impl::StreamMul( const long x , const long y , long & z ) { + z = x*y ; +} +void DataStream_Impl::StreamDiv( const long x , const long y , long & z ) { + z = x/y ; +} + diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.hxx b/src/DataStreamComponent/DataStreamComponent_Impl.hxx new file mode 100644 index 0000000..6998143 --- /dev/null +++ b/src/DataStreamComponent/DataStreamComponent_Impl.hxx @@ -0,0 +1,106 @@ +// SuperVisionTest DataStreamComponent : example of component +// +// 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 : DataStreamComponent_Impl.hxx +// Author : Jean Rahuel +// Module : SuperVisionTest +// $Header: + +#ifndef _DATASTREAMINTERFACE_IMPL_HXX_ +#define _DATASTREAMINTERFACE_IMPL_HXX_ + +#include +#include CORBA_SERVER_HEADER(DataStreamComponent) +#include CORBA_SERVER_HEADER(SALOME_Component) +#include "SALOME_Component_i.hxx" + +class DataStreamFactory_Impl : public POA_DataStreamComponent::DataStreamFactory , + public Engines_Component_i { +public: + DataStreamFactory_Impl() ; + DataStreamFactory_Impl( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName); + + virtual ~DataStreamFactory_Impl(); + + virtual void Setxy( const long x , const long y ) ; + + virtual void Getxy( long & x , long & y ) ; + + virtual void Add( const long x , const long y , long & z ) ; + virtual void Sub( const long x , const long y , long & z ) ; + virtual void Mul( const long x , const long y , long & z ) ; + virtual void Div( const long x , const long y , long & z ) ; + + virtual DataStreamComponent::DataStream_ptr NewDataStream() ; + +private: + + long _x ; + long _y ; + +}; + +extern "C" + PortableServer::ObjectId * DataStreamFactoryEngine_factory + ( CORBA::ORB_ptr orb , + PortableServer::POA_ptr poa , + PortableServer::ObjectId * contId , + const char *instanceName , + const char *interfaceName ) ; + + +class DataStream_Impl : public POA_DataStreamComponent::DataStream , + public Engines_Component_i { +public: + DataStream_Impl() ; + DataStream_Impl( CORBA::ORB_ptr orb , + PortableServer::POA_ptr poa , + PortableServer::ObjectId * contId , + const char *instanceName , + const char *interfaceName , + const char * graphName , + const char * nodeName ); + + virtual ~DataStream_Impl(); + + virtual void StreamSetxy( const long x , const long y ) ; + + virtual void StreamGetxy( long & x , long & y ) ; + + virtual void StreamAdd( const long x , const long y , long & z ) ; + virtual void StreamSub( const long x , const long y , long & z ) ; + virtual void StreamMul( const long x , const long y , long & z ) ; + virtual void StreamDiv( const long x , const long y , long & z ) ; + +private: + + long _x ; + long _y ; + +}; + +#endif diff --git a/src/DataStreamComponent/Makefile.in b/src/DataStreamComponent/Makefile.in new file mode 100644 index 0000000..447bfb9 --- /dev/null +++ b/src/DataStreamComponent/Makefile.in @@ -0,0 +1,59 @@ +# SUPERV DataStreamComponent : example of component +# +# 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 : Jean Rahuel +# Module : SUPERV +# $Header: + +top_srcdir=@top_srcdir@ +top_builddir=../.. +srcdir=@srcdir@ +VPATH=.:@srcdir@:@top_srcdir@/idl + + +@COMMENCE@ + +EXPORT_HEADERS = \ + DataStreamComponent_Impl.hxx + +# Libraries targets +LIB = libDataStreamFactoryEngine.la +LIB_SRC = \ + DataStreamComponent_Impl.cxx + +LIB_SERVER_IDL = SALOME_Component.idl \ + DataStreamComponent.idl + +# Executables targets +BIN = DataStreamComponent_CheckOfUndefined +BIN_SRC = +BIN_SERVER_IDL = + +CPPFLAGS+= $(PYTHON_INCLUDES) \ + -I${KERNEL_ROOT_DIR}/include/salome +LDFLAGS+= -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSalomeLoggerServer \ + -L${KERNEL_ROOT_DIR}/lib/salome + +@CONCLUDE@ + diff --git a/src/Makefile.in b/src/Makefile.in index fd7b547..513def7 100755 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,6 +32,6 @@ VPATH=.:@srcdir@ @COMMENCE@ -SUBDIRS = AddComponent DivComponent FactorialComponent MulComponent SubComponent SyrComponent SyrControlComponent TypesCheck CalculatorComponent +SUBDIRS = AddComponent DivComponent FactorialComponent MulComponent SubComponent SyrComponent SyrControlComponent TypesCheck DataStreamComponent CalculatorComponent @MODULE@ -- 2.39.2