From: ribes Date: Mon, 5 Mar 2007 16:05:01 +0000 (+0000) Subject: Calcium and Palm ok X-Git-Tag: DSC_OK~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b0bf17f0081f052dd221d73b465d9123b139f5c3;p=modules%2Fkernel.git Calcium and Palm ok --- diff --git a/configure.ac b/configure.ac index f6ee7f2a0..ffd5a5215 100644 --- a/configure.ac +++ b/configure.ac @@ -521,6 +521,10 @@ AC_OUTPUT([ \ ./src/DSC/Makefile \ ./src/DSC/DSC_Basic/Makefile \ ./src/DSC/DSC_User/Makefile \ + ./src/DSC/DSC_User/Basic/Makefile \ + ./src/DSC/DSC_User/Datastream/Makefile \ + ./src/DSC/DSC_User/Datastream/Palm/Makefile \ + ./src/DSC/DSC_User/Datastream/Calcium/Makefile \ ./src/GenericObj/Makefile \ ./src/HDFPersist/Makefile \ ./src/KERNEL_PY/Makefile \ diff --git a/idl/Calcium_Ports.idl b/idl/Calcium_Ports.idl index eb5eb97ba..206589e7d 100644 --- a/idl/Calcium_Ports.idl +++ b/idl/Calcium_Ports.idl @@ -1,25 +1,7 @@ -// Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File : Calcium_Ports.idl -// Author : Eric FAYOLLE, EDF -// $Header: +// Eric Fayolle - EDF R&D +// Modified by : $LastChangedBy$ +// Date : $LastChangedDate: 2007-01-08 19:01:14 +0100 (Mon, 08 Jan 2007) $ +// Id : $Id$ #ifndef _CALCIUM_PORTS_IDL_ #define _CALCIUM_PORTS_IDL_ @@ -30,6 +12,14 @@ module Ports { module Calcium_Ports { + typedef boolean DisconnectDirective; + const DisconnectDirective stop = FALSE; + const DisconnectDirective cont = TRUE; + + interface Calcium_Port : Ports::Data_Port { + void disconnect(in DisconnectDirective mode); + }; + typedef sequence seq_long; typedef sequence seq_float; typedef sequence seq_double; @@ -37,27 +27,27 @@ module Ports { typedef sequence seq_boolean; typedef seq_float seq_complex; - interface Calcium_Integer_Port : Ports::Data_Port { + interface Calcium_Integer_Port : Calcium_Port { void put (in seq_long data, in double time, in long tag); }; - interface Calcium_Real_Port : Ports::Data_Port { + interface Calcium_Real_Port : Calcium_Port { void put (in seq_float data, in double time, in long tag); }; - interface Calcium_Double_Port : Ports::Data_Port { + interface Calcium_Double_Port : Calcium_Port { void put (in seq_double data, in double time, in long tag); }; - interface Calcium_String_Port : Ports::Data_Port { + interface Calcium_String_Port : Calcium_Port { void put (in seq_string data, in double time, in long tag); }; - interface Calcium_Logical_Port : Ports::Data_Port { + interface Calcium_Logical_Port : Calcium_Port { void put (in seq_boolean data, in double time, in long tag); }; - interface Calcium_Complex_Port : Ports::Data_Port { + interface Calcium_Complex_Port : Calcium_Port { void put (in seq_complex data, in double time, in long tag); }; diff --git a/idl/Makefile.am b/idl/Makefile.am index 43ebb907f..11d80b71d 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -44,7 +44,8 @@ BASEIDL_FILES = \ nstest.idl \ DSC_Engines.idl \ SALOME_Ports.idl \ - Calcium_Ports.idl + Calcium_Ports.idl \ + Palm_Ports.idl MPIIDL_FILES = \ SALOME_MPIObject.idl \ @@ -84,7 +85,8 @@ BASEIDL_SOURCES =\ nstestSK.cc \ DSC_EnginesSK.cc \ SALOME_PortsSK.cc \ - Calcium_PortsSK.cc + Calcium_PortsSK.cc \ + Palm_PortsSK.cc MPIIDL_SOURCES = \ SALOME_MPIObjectSK.cc \ diff --git a/idl/Palm_Ports.idl b/idl/Palm_Ports.idl new file mode 100644 index 000000000..267c5795e --- /dev/null +++ b/idl/Palm_Ports.idl @@ -0,0 +1,29 @@ +// André Ribes - EDF R&D 2006 + +#ifndef _PALM_PORTS_IDL_ +#define _PALM_PORTS_IDL_ + +#include "SALOME_Ports.idl" + +module Ports { + + module Palm_Ports { + + // Tous les ports Palm ont + // une méthode put avec 3 arguments + // dont les deux derniers sont : + // in long time, in long tag + + interface Palm_Data_Short_Port : Ports::Data_Port { + void put (in short data, in long time, in long tag); + }; + + typedef sequence seq_short; + interface Palm_Data_Seq_Short_Port : Ports::Data_Port { + void put (in seq_short data, in long time, in long tag); + }; + + }; +}; + +#endif diff --git a/idl/SALOME_Ports.idl b/idl/SALOME_Ports.idl index fb81ec3d1..ba880c6bd 100644 --- a/idl/SALOME_Ports.idl +++ b/idl/SALOME_Ports.idl @@ -106,7 +106,15 @@ module Ports { */ any get_property(in string name) raises (Ports::NotDefined); }; - + + /*! \brief Interface of a basic datastream short port + This interface defines a Data_Port that transmit a CORBA::Short. + This interface can be seen as an example of an integration of + a port in the DSC_User programming model. + */ + interface Data_Short_Port : Ports::Data_Port { + void put(in short data); + }; }; #endif diff --git a/src/DSC/DSC_User/Basic/Makefile.am b/src/DSC/DSC_User/Basic/Makefile.am index 4c6897ae3..14ef6311f 100644 --- a/src/DSC/DSC_User/Basic/Makefile.am +++ b/src/DSC/DSC_User/Basic/Makefile.am @@ -1,15 +1,68 @@ -lib_LTLIBRARIES = libSalomeDSCSupervBasic.la +# Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : André RIBES (EDF) +# Module : KERNEL + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = basic_port_factory.hxx \ + data_short_port_provides.hxx \ + data_short_port_uses.hxx + +# +# =============================================================== +# Local definitions +# =============================================================== +# -libSalomeDSCSupervBasic_la_SOURCES = basic_port_factory.cxx data_short_port_uses.cxx data_short_port_provides.cxx -libSalomeDSCSupervBasic_la_CXXFLAGS = -I$(top_srcdir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_Basic\ - -I$(top_builddir)/src/DSC_User \ - -I@KERNEL_ROOT_DIR@/include/salome \ - -I$(top_builddir)/idl \ - @OMNIORB_INCLUDES@ +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS= -I$(top_builddir)/idl \ + -I$(top_srcdir)/src/DSC/DSC_Basic \ + -I$(top_srcdir)/src/DSC/DSC_User \ + -I$(top_builddir)/salome_adm/unix \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS = + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +lib_LTLIBRARIES = libSalomeDSCSupervBasic.la -################################################################################################################## +libSalomeDSCSupervBasic_la_SOURCES = basic_port_factory.cxx \ + data_short_port_uses.cxx \ + data_short_port_provides.cxx -include_HEADERS = basic_port_factory.hxx data_short_port_provides.hxx data_short_port_uses.hxx +libSalomeDSCSupervBasic_la_CXXFLAGS = -no-undefined -version-info=0:0:0 \ + $(COMMON_CPPFLAGS) -CLEANFILES = *.hh *SK.cc diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am index 6399a774f..0d626cc24 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am @@ -1,73 +1,111 @@ -BUILT_SOURCES = SALOME_Component.hh SALOME_Exception.hh +# Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : André RIBES (EDF), Eric Fayolle (EDF) +# Module : KERNEL +# -%.hh : @KERNEL_ROOT_DIR@/idl/salome/%.idl - @IDL@ @IDLGENFLAGS@ -I@KERNEL_ROOT_DIR@/idl/salome $< +include $(top_srcdir)/salome_adm/unix/make_common_starter.am -AM_CXXFLAGS = -I$(top_srcdir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_User/Datastream \ - -I$(top_srcdir)/src/DSC_Basic \ - -I@KERNEL_ROOT_DIR@/include/salome \ - -I$(top_builddir)/idl \ - @OMNIORB_INCLUDES@ +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = calcium_port_factory.hxx \ + CalciumGenericProvidesPort.hxx \ + calcium_uses_port.hxx \ + CalciumGenericUsesPort.hxx \ + calcium_port_provides.hxx \ + calcium_integer_port_uses.hxx \ + calcium_real_port_uses.hxx \ + calcium_double_port_uses.hxx \ + calcium_string_port_uses.hxx \ + calcium_logical_port_uses.hxx \ + calcium_complex_port_uses.hxx \ + CalciumCouplingPolicy.hxx \ + CalciumTypes.hxx \ + CalciumInterface.hxx \ + Copy2UserSpace.hxx \ + Copy2CorbaSpace.hxx \ + CalciumPortTraits.hxx \ + calcium.h \ + calciumP.h \ + version.h \ + calcium.hf +# +# =============================================================== +# Local definitions +# =============================================================== +# +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \ + -I$(top_srcdir)/src/DSC/DSC_User/Datastream \ + -I$(top_srcdir)/src/DSC/DSC_Basic \ + -I$(top_srcdir)/src/SALOMELocalTrace \ + -I$(top_srcdir)/src/Basics \ + -I$(top_srcdir)/src/Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS = @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# noinst_LTLIBRARIES = libSalomeCalcium.la -nodist_libSalomeCalcium_la_SOURCES = $(top_builddir)/idl/Calcium_PortsSK.cc + libSalomeCalcium_la_SOURCES = calcium_port_factory.cxx \ - calcium_uses_port.cxx \ - calcium_repository_types.cxx \ - CalciumCouplingPolicy.cxx \ - calcium_destructors_port_provides.cxx \ - calcium_destructors_port_uses.cxx -libSalomeCalcium_la_LDFLAGS = -L@KERNEL_ROOT_DIR@/lib/salome/ -lOpUtil + calcium_uses_port.cxx \ + calcium_repository_types.cxx \ + CalciumCouplingPolicy.cxx \ + calcium_destructors_port_provides.cxx \ + calcium_destructors_port_uses.cxx + +libSalomeCalcium_la_CXXFLAGS = -no-undefined -version-info=0:0:0 \ + $(COMMON_CPPFLAGS) lib_LTLIBRARIES = libCalciumC.la -libCalciumC_la_SOURCES = Calcium.c -## TESTS ## +libCalciumC_la_SOURCES = Calcium.c +# +# =============================================================== +# Executables targets +# =============================================================== +# noinst_PROGRAMS = test_DataIdContainer -test_DataIdContainer_SOURCES = test_DataIdContainer.cxx -test_DataIdContainer_LDADD = libSalomeCalcium.la - -## pas normal d'être obligé de linké à caus de __init___...thread -test_DataIdContainer_LDFLAGS = -L@KERNEL_ROOT_DIR@/lib/salome -test_DataIdContainer_LDFLAGS += @OMNIORB_LIBS@ -lomniORB4 -lomniDynamic4 -lCOS4 -lCOSDynamic4 -lomnithread - -#noinst_PROGRAMS += test_CalciumInterface -#test_CalciumInterface_SOURCES = test_CalciumInterface.cxx -#DSC_User = $(top_srcdir)/src/DSC_User -#test_CalciumInterface_CXXFLAGS = -I$(DSC_User)/Basic \ -# -I$(DSC_User) \ -# -I$(top_srcdir)/src/DSC_Basic \ -# -I$(DSC_User)/Datastream \ -# -I$(DSC_User)/Datastream/Palm \ -# -I$(DSC_User)/Datastream/Calcium \ -# -I@KERNEL_ROOT_DIR@/include/salome \ -# -I$(top_builddir)/idl \ -# @OMNIORB_INCLUDES@ - -## pas normal d'être obligé de linké à caus de __init___...thread -#test_CalciumInterface_LDFLAGS = -L@KERNEL_ROOT_DIR@/lib/salome -#test_CalciumInterface_LDFLAGS += -lomniORB4 -lomniDynamic4 -lCOS4 -lCOSDynamic4 -lomnithread -#test_CalciumInterface_LDADD = -lOpUtil libSalomeCalcium.la $(DSC_User)/libSalomeDSCSuperv.la +test_DataIdContainer_SOURCES = test_DataIdContainer.cxx -TESTS = test_DataIdContainer -#test_CalciumInterface +test_DataIdContainer_CXXFLAGS = $(COMMON_CPPFLAGS) +test_DataIdContainer_LDADD = libSalomeCalcium.la $(top_builddir)/src/Utils/libOpUtil.la -include_HEADERS = calcium_port_factory.hxx \ - CalciumGenericProvidesPort.hxx \ - calcium_uses_port.hxx CalciumGenericUsesPort.hxx \ - calcium_port_provides.hxx \ - calcium_integer_port_uses.hxx \ - calcium_real_port_uses.hxx \ - calcium_double_port_uses.hxx \ - calcium_string_port_uses.hxx \ - calcium_logical_port_uses.hxx \ - calcium_complex_port_uses.hxx \ - CalciumCouplingPolicy.hxx CalciumTypes.hxx CalciumInterface.hxx \ - Copy2UserSpace.hxx Copy2CorbaSpace.hxx CalciumPortTraits.hxx -include_HEADERS += calcium.h calciumP.h version.h calcium.hf -CLEANFILES = *.hh *SK.cc +test_DataIdContainer_LDFLAGS = $(COMMON_LIBS) diff --git a/src/DSC/DSC_User/Datastream/Makefile.am b/src/DSC/DSC_User/Datastream/Makefile.am index a10b336b2..55fbcaf15 100644 --- a/src/DSC/DSC_User/Datastream/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Makefile.am @@ -1,23 +1,75 @@ +# Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : André RIBES (EDF), Eric Fayolle (EDF) +# Module : KERNEL + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +SUBDIRS = Palm Calcium + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = GenericPort.hxx \ + GenericUsesPort.hxx \ + DataIdFilter.hxx \ + CorbaTypeManipulator.hxx \ + CouplingPolicy.hxx \ + DisplayPair.hxx \ + FindKeyPredicate.hxx \ + AdjacentFunctor.hxx \ + IteratorTraits.hxx \ + ConstTraits.hxx \ + lambda.hpp \ + DatastreamException.hxx + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS = $(top_builddir)/src/DSC/DSC_User/Datastream/Palm/libSalomePalm.la \ + $(top_builddir)/src/DSC/DSC_User/Datastream/Calcium/libSalomeCalcium.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# lib_LTLIBRARIES = libSalomeDatastream.la libSalomeDatastream_la_SOURCES = fake.cc -#DatastreamException_cxx_CXXFLAGS = -I@KERNEL_ROOT_DIR@/include/salome -#nodist_libSalomeDatastream_la_SOURCES = $(top_builddir)/idl/Datastream_PortsSK.cc -libSalomeDatastream_la_CXXFLAGS = -I$(top_srcdir)/src/DSC_User -# -I$(top_srcdir)/src/DSC_User/Datastream/Palm \ -# -I@KERNEL_ROOT_DIR@/include/salome \ -# -I$(top_builddir)/idl \ -# @OMNIORB_INCLUDES@ -libSalomeDatastream_la_LIBADD = Palm/libSalomePalm.la Calcium/libSalomeCalcium.la -libSalomeDatastream_la_LDFLAGS = -no-undefined -version-info 0:0:0 -################################################################################################################## +libSalomeDatastream_la_CXXFLAGS = -no-undefined -version-info=0:0:0 \ + $(COMMON_CPPFLAGS) -include_HEADERS = GenericPort.hxx GenericUsesPort.hxx DataIdFilter.hxx CorbaTypeManipulator.hxx \ - CouplingPolicy.hxx DisplayPair.hxx \ - FindKeyPredicate.hxx AdjacentFunctor.hxx IteratorTraits.hxx ConstTraits.hxx \ - lambda.hpp DatastreamException.hxx +libSalomeDatastream_la_LIBADD = $(COMMON_LIBS) -CLEANFILES = *.hh *SK.cc - -SUBDIRS = Palm Calcium diff --git a/src/DSC/DSC_User/Datastream/Palm/Makefile.am b/src/DSC/DSC_User/Datastream/Palm/Makefile.am index 268189c27..1616c7948 100644 --- a/src/DSC/DSC_User/Datastream/Palm/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Palm/Makefile.am @@ -1,49 +1,81 @@ -AM_CXXFLAGS = -I$(top_srcdir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_User/Datastream \ - -I$(top_builddir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_Basic \ - -I@KERNEL_ROOT_DIR@/include/salome \ - -I$(top_builddir)/idl \ - @OMNIORB_INCLUDES@ \ - -I$(top_srcdir)/src/DSC_User/Datastream/Calcium +# Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : André RIBES (EDF), Eric Fayolle (EDF) +# Module : KERNEL -BUILT_SOURCES = SALOME_Component.hh SALOME_Exception.hh +include $(top_srcdir)/salome_adm/unix/make_common_starter.am -%.hh : @KERNEL_ROOT_DIR@/idl/salome/%.idl - @IDL@ @IDLGENFLAGS@ -I@KERNEL_ROOT_DIR@/idl/salome $< +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = palm_port_factory.hxx \ + palm_data_short_port_provides.hxx \ + palm_data_seq_short_port_provides.hxx \ + PalmCouplingPolicy.hxx -noinst_LTLIBRARIES = libSalomePalm.la +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \ + -I$(top_srcdir)/src/DSC/DSC_User/Datastream \ + -I$(top_srcdir)/src/DSC/DSC_Basic \ + -I$(top_srcdir)/src/Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -libSalomePalm_la_SOURCES = palm_port_factory.cxx -nodist_libSalomePalm_la_SOURCES = $(top_builddir)/idl/Palm_PortsSK.cc -libSalomePalm_la_CXXFLAGS = -I$(top_srcdir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_User/Datastream \ - -I$(top_builddir)/src/DSC_User \ - -I$(top_srcdir)/src/DSC_Basic \ - -I@KERNEL_ROOT_DIR@/include/salome \ - -I$(top_builddir)/idl \ - @OMNIORB_INCLUDES@ \ - -I$(top_srcdir)/src/DSC_User/Datastream/Calcium +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS = @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +noinst_LTLIBRARIES = libSalomePalm.la +libSalomePalm_la_SOURCES = palm_port_factory.cxx -## Réussir la déclaration forward ds ProcessTimeInterval.hxx afin d'enlever la ligne précédente +libSalomePalm_la_CXXFLAGS = -no-undefined -version-info=0:0:0 \ + $(COMMON_CPPFLAGS) +# +# =============================================================== +# Executables targets +# =============================================================== +# noinst_PROGRAMS = test_DataIdContainer + test_DataIdContainer_SOURCES = test_DataIdContainer.cxx -## pas normal d'être obligé de linké à caus de __init___...thread -test_DataIdContainer_LDFLAGS = -L@KERNEL_ROOT_DIR@/lib/salome -#-L@PARALLEL_KERNEL_ROOT_DIR@/lib -test_DataIdContainer_LDFLAGS += @OMNIORB_LIBS@ -lomniORB4 -lomniDynamic4 -lCOS4 -lCOSDynamic4 -lomnithread -##\ -## -lSalomeDSCContainer -lSalomeDSCSuperv -lSalomeDSCSupervDatastream -lSalomeDSCSupervBasic - -TESTS = test_DataIdContainer -##test_DataIdContainer_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/src/DSC_User/Basic \ -## -I$(top_srcdir)/src/DSC -################################################################################################################## - -include_HEADERS = palm_port_factory.hxx palm_data_short_port_provides.hxx \ - palm_data_seq_short_port_provides.hxx PalmCouplingPolicy.hxx - -CLEANFILES = *.hh *SK.cc + +test_DataIdContainer_CXXFLAGS = $(COMMON_CPPFLAGS) + +test_DataIdContainer_LDFLAGS = $(COMMON_LIBS) diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am index e69de29bb..92f65e3c9 100644 --- a/src/DSC/DSC_User/Makefile.am +++ b/src/DSC/DSC_User/Makefile.am @@ -0,0 +1,28 @@ +# Copyright (C) 2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : André RIBES (EDF) +# Module : KERNEL + +SUBDIRS = Basic Datastream + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am