From 448f128037286fec40e3022afe2a230a9797cdf9 Mon Sep 17 00:00:00 2001 From: caremoli Date: Tue, 26 Jun 2007 09:15:35 +0000 Subject: [PATCH] CCAR: transfer Python interface from DSC_User/Datastream/Calcium to DSC_Python --- src/DSC/DSC_Python/Makefile.am | 79 +++++++++++++++++++ .../Calcium => DSC_Python}/calcium.i | 0 .../Calcium => DSC_Python}/dsccalcium.py | 0 .../DSC_User/Datastream/Calcium/Makefile.am | 20 ----- src/DSC/DSC_User/Makefile.am | 2 +- src/DSC/Makefile.am | 2 +- 6 files changed, 81 insertions(+), 22 deletions(-) create mode 100644 src/DSC/DSC_Python/Makefile.am rename src/DSC/{DSC_User/Datastream/Calcium => DSC_Python}/calcium.i (100%) rename src/DSC/{DSC_User/Datastream/Calcium => DSC_Python}/dsccalcium.py (100%) diff --git a/src/DSC/DSC_Python/Makefile.am b/src/DSC/DSC_Python/Makefile.am new file mode 100644 index 000000000..48ed93f93 --- /dev/null +++ b/src/DSC/DSC_Python/Makefile.am @@ -0,0 +1,79 @@ +# 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 + +# =============================================================== +# 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_User/Datastream/Palm \ + -I$(top_srcdir)/src/DSC/DSC_User/Datastream/Calcium \ + -I$(top_srcdir)/src/DSC/DSC_User/Basic \ + -I$(top_srcdir)/src/DSC/DSC_Basic \ + -I$(top_srcdir)/src/SALOMELocalTrace \ + -I$(top_srcdir)/src/Basics \ + -I$(top_srcdir)/src/Utils \ + -I$(top_srcdir)/src/Container \ + -I$(top_srcdir)/src/Notification \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @BOOST_CPPFLAGS@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS = @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +AM_CFLAGS = -fexceptions +pkgpython_PYTHON = calcium.py dsccalcium.py +pkgpyexec_LTLIBRARIES = _calcium.la +SWIG_FLAGS= -python -c++ -noexcept +SWIG_SRC=calcium.i +_calcium_la_SOURCES = calcium_wrap.cpp +_calcium_la_LDFLAGS = -module +_calcium_la_LIBADD = ../DSC_User/Datastream/Calcium/libCalciumC.la \ + ../DSC_User/Datastream/libSalomeDatastream.la \ + ../DSC_User/Basic/libSalomeDSCSupervBasic.la \ + ../DSC_User/libSalomeDSCSuperv.la \ + ../DSC_Basic/libSalomeDSCContainer.la \ + ../../Container/libSalomeContainer.la + +_calcium_la_CXXFLAGS = $(PYTHON_INCLUDES) $(COMMON_CPPFLAGS) + +calcium_wrap.cpp calcium.py:calcium.i + $(SWIG) $(SWIG_FLAGS) -o calcium_wrap.cpp $< + +CLEANFILES = calcium_wrap.cpp + diff --git a/src/DSC/DSC_User/Datastream/Calcium/calcium.i b/src/DSC/DSC_Python/calcium.i similarity index 100% rename from src/DSC/DSC_User/Datastream/Calcium/calcium.i rename to src/DSC/DSC_Python/calcium.i diff --git a/src/DSC/DSC_User/Datastream/Calcium/dsccalcium.py b/src/DSC/DSC_Python/dsccalcium.py similarity index 100% rename from src/DSC/DSC_User/Datastream/Calcium/dsccalcium.py rename to src/DSC/DSC_Python/dsccalcium.py diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am index ee7064940..6f829cd01 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am @@ -109,26 +109,6 @@ lib_LTLIBRARIES = libCalciumC.la libCalciumC_la_SOURCES = Calcium.c Calcium.cxx calciumf.c libCalciumC_la_CXXFLAGS = $(COMMON_CPPFLAGS) -pkgpython_PYTHON = calcium.py dsccalcium.py -pkgpyexec_LTLIBRARIES = _calcium.la -SWIG_FLAGS= -python -c++ -noexcept -SWIG_SRC=calcium.i -_calcium_la_SOURCES = calcium_wrap.cpp -_calcium_la_LDFLAGS = -module -_calcium_la_LIBADD = libCalciumC.la \ - ../libSalomeDatastream.la \ - ../../Basic/libSalomeDSCSupervBasic.la \ - ../../libSalomeDSCSuperv.la \ - ../../../DSC_Basic/libSalomeDSCContainer.la \ - ../../../../Container/libSalomeContainer.la - -_calcium_la_CXXFLAGS = $(PYTHON_INCLUDES) $(COMMON_CPPFLAGS) - -calcium_wrap.cpp calcium.py:calcium.i - $(SWIG) $(SWIG_FLAGS) -o calcium_wrap.cpp $< - -CLEANFILES = calcium_wrap.cpp - # # =============================================================== # Executables targets diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am index ec9ce2fbc..37d753254 100644 --- a/src/DSC/DSC_User/Makefile.am +++ b/src/DSC/DSC_User/Makefile.am @@ -23,7 +23,6 @@ # Author : André RIBES (EDF) # Module : KERNEL -SUBDIRS = Basic Datastream include $(top_srcdir)/salome_adm/unix/make_common_starter.am @@ -93,3 +92,4 @@ test_DSC_Exception_CXXFLAGS = $(COMMON_CPPFLAGS) test_DSC_Exception_LDADD = $(top_builddir)/src/Utils/libOpUtil.la +SUBDIRS = Basic Datastream diff --git a/src/DSC/Makefile.am b/src/DSC/Makefile.am index fb949237f..edc4849c7 100644 --- a/src/DSC/Makefile.am +++ b/src/DSC/Makefile.am @@ -27,4 +27,4 @@ if WITH_PACO_PARALLEL SUBDIR_PAR = ParallelDSC endif -SUBDIRS = DSC_Basic DSC_User $(SUBDIR_PAR) +SUBDIRS = DSC_Basic DSC_User $(SUBDIR_PAR) DSC_Python -- 2.39.2