]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
1) Add CMake files to the dist rules (make dist)
authorinv <inv@opencascade.com>
Tue, 9 Oct 2012 08:30:15 +0000 (08:30 +0000)
committerinv <inv@opencascade.com>
Tue, 9 Oct 2012 08:30:15 +0000 (08:30 +0000)
2) Fix problems of make dist (missing files)

25 files changed:
Makefile.am
doc/Makefile.am
doc/docutils/Makefile.am
doc/salome/Makefile.am
doc/salome/gui/Makefile.am
doc/salome/tui/Makefile.am
idl/Makefile.am
resources/Makefile.am
salome_adm/cmake_files/Makefile.am
salome_adm/unix/make_common_starter.am
src/Communication/CMakeLists.txt
src/Communication/Makefile.am
src/Communication/Receiver.cxx [deleted file]
src/Communication_SWIG/Makefile.am
src/DSC/DSC_Python/Makefile.am
src/DSC/DSC_User/Datastream/CMakeLists.txt
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
src/DSC/DSC_User/Datastream/Calcium/Makefile.am
src/DSC/Makefile.am
src/HDFPersist/Makefile.am
src/LifeCycleCORBA_SWIG/Makefile.am
src/Makefile.am
src/ModuleGenerator/Makefile.am
src/NOTIFICATION_SWIG/Makefile.am
src/SALOMEDS/Test/Makefile.am

index 471d18f5ddae709eeb2a2bfc0b466b44c14c1f72..abfd02f99af79dd4f2fc3fa5484976bbf1729bd3 100644 (file)
@@ -45,7 +45,7 @@ DISTCLEANFILES = a.out local-install.sh hack_libtool aclocal.m4 configure salome
 
 salomeinclude_DATA = KERNEL_version.h
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        build_cmake \
        build_cmake.bat \
        build_configure \
index 2cdd838a3bb488b170d929c27d66f2db63fbbe8e..bce7733f8f72da7ed0c1cdf0af8004034a6b4dd1 100644 (file)
@@ -29,7 +29,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 SUBDIRS = salome docutils
 
-EXTRA_DIST = configuration_examples README.cluster-CCRT
+EXTRA_DIST += configuration_examples README.cluster-CCRT
 
 docs: usr_docs
 
index 9764cb72760135bd3532493c4a61b2971091bf5a..36acceb96a371ea098de3167d749ddbb424ac539 100644 (file)
@@ -33,7 +33,7 @@ RSTFILES = \
        kernel.rst \
        parametric.rst
 
-EXTRA_DIST = archives $(RSTFILES)
+EXTRA_DIST += archives $(RSTFILES)
 
 SPHINXOPTS      =
 SOURCEDIR       = $(srcdir)
index a4d7dd4ecd6ce60e67a235c321effe21ac238831..d683bac5adc59f27d0a74c739ba6ec33810cca6a 100644 (file)
@@ -39,8 +39,8 @@ dev_docs:
        echo "Making dev_docs in tui"; \
        (cd tui && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
 
-EXTRA_DIST= main.dox install.dox \
+EXTRA_DIST+= main.dox install.dox \
            kernel_resources.dox kernel_services.dox kernel_services_cpphelpers.dox \
            salome_application.dox unittests.dox \
-           salome_file.dox kernel_salome.dox \
+           salome_file.dox kernel_salome.dox running_salome.dox \
            examples
index f5f8a47db03a19f5e4bcbb9dd01c060fce8cd108..13cc6565e204abe7631ad3286e0ddde14eec2dff 100644 (file)
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-EXTRA_DIST = images static/footer.html static/doxygen.css
+EXTRA_DIST += images static/footer.html static/doxygen.css
 
 guidocdir = $(docdir)/gui/KERNEL
 guidoc_DATA = images/head.png
index eb465301e02d76c4529d6ed3e053a8a167f623b0..d6ea2af939ddec9d329c5ad40034b77d11b5f743 100644 (file)
@@ -27,7 +27,7 @@
 #
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
-EXTRA_DIST = images input static/footer.html static/doxygen.css
+EXTRA_DIST += images input static/footer.html static/doxygen.css
 
 tuidocdir = $(docdir)/tui/KERNEL
 tuidoc_DATA = images/head.png
index 1347ad5e0c4b80fc0dcbd5f8633afd8f71081c96..cf953c8e742cbca9f88cea4df5c30c91649508df 100644 (file)
@@ -69,7 +69,7 @@ OTHER_IDL_FILES = \
   TypeData.idl
 
 # all the idl files are needed for make dist
-EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \
+EXTRA_DIST += $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \
            SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \
            SALOME_PACOExtension.xml SALOME_ParamPorts.xml \
            SALOME_GenericObj.xml SALOME_Exception.xml
index 1e746e5303bc9eff0fa757f26c70f4459b3c4c18..1881203ef4d80f461ed5d665ee5b4e8a883fb7f2 100644 (file)
@@ -52,4 +52,4 @@ else
        KERNELCatalog.xml
 endif
 
-EXTRA_DIST = CatalogDataType.xml
+EXTRA_DIST += CatalogDataType.xml
index b21d38c4e5cfa47c751263cc0e105170b8602d1f..22ede73e637bc3775fa117e1ae1becc601479209 100644 (file)
@@ -39,6 +39,7 @@ FindPTHREADS.cmake \
 FindPYTHON.cmake \
 FindSWIG.cmake \
 FindSPHINX.cmake \
+SalomeMacros.cmake \
 install_python_from_idl.cmake \
 install_and_compile_python_file.cmake \
 InstallAndCompilePythonFile.cmake
index 3842661ddc028033319ff501820c591ba6835e1e..e5bcd35c140880a8b5c03b241d776eb688687875 100644 (file)
@@ -76,3 +76,7 @@ sharedpkgpythondir =$(salomepythondir)/shared_modules
 
 # Documentation directory
 docdir             = $(datadir)/doc/salome
+
+# Cmake files
+CMAKEFILES         = $(notdir $(wildcard $(srcdir)/CMakeLists.txt))
+EXTRA_DIST         = $(CMAKEFILES)
\ No newline at end of file
index 4d1b1de036b11c2e9309ef7f64308da95512c148..796ffddedbe2150a4dddc025d7597c1bd7a80662 100755 (executable)
@@ -59,13 +59,18 @@ SET_TARGET_PROPERTIES(SalomeCommunication PROPERTIES COMPILE_FLAGS "${OMNIORB_DE
 TARGET_LINK_LIBRARIES(SalomeCommunication ${COMMON_LIBS} ${PYTHON_LIBS} ${MPI_LIBS})
 INSTALL(TARGETS SalomeCommunication DESTINATION ${KERNEL_salomelib_LIBS})
 
-FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-SET(NOINST_HEADERS_HXX
+SET(COMMON_HEADERS_HXX
+  MatrixClient.hxx
+  MultiCommException.hxx
   Receiver.hxx
+  ReceiverFactory.hxx
   Receivers.hxx
+  Receivers.cxx
+  SALOMEMultiComm.hxx
+  SALOME_Comm_i.hxx
+  SALOME_Communication.hxx
+  SALOME_Matrix_i.hxx
+  SenderFactory.hxx
 )
-FOREACH(HEADER ${NOINST_HEADERS_HXX})
-  LIST(REMOVE_ITEM COMMON_HEADERS_HXX ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER})
-ENDFOREACH(HEADER ${NOINST_HEADERS_HXX})
 
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS})
index 6255807a8c796ad7718102cdf17f1161a0353d2a..391173d1705e2ee56cf5c725115a580cf480575d 100644 (file)
@@ -92,7 +92,7 @@ libSalomeCommunication_la_SOURCES =\
        Receiver.hxx
 
 # the following file is needed by an include file (VERY DIRTY!)
-EXTRA_DIST = Receivers.cxx
+EXTRA_DIST += Receivers.cxx
 
 libSalomeCommunication_la_CPPFLAGS = $(COMMON_CPPFLAGS) $(OPT_CPPFLAGS)
 libSalomeCommunication_la_LDFLAGS  = -no-undefined -version-info=0:0:0 $(OPT_LDFLAGS)
diff --git a/src/Communication/Receiver.cxx b/src/Communication/Receiver.cxx
deleted file mode 100644 (file)
index ff240bc..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-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
-//
-
-#include "Receiver.hxx"
-#include <string.h>
-
-/*!
-  return a deep copy of the array contained in the servant.
- */
-void *Receiver::getLocalValue(long &size,SALOME_Sender_i* servant)
-{
-  const void *src=servant->getData(size);
-  long lgr=size*servant->getSizeOf();
-  void *ret=new char[lgr];
-  memcpy(ret,src,lgr);
-  return ret;
-  //return (void *)servant->getData(size);
-}
-
-void *Receiver::getValue(long &size,SALOME::Sender_ptr sender)
-{
-  SALOME_Sender_i* data=SALOME_Sender_i::find(sender);
-  if(data)
-    return getLocalValue(size,data);
-  else
-    return getDistValue(size);
-}
-
index 9f03d8b56f8827c6e34280acaa7ae73c8be2c754..bdd171cdb8c86fe5859184c203ab390f0ba5e56e 100644 (file)
@@ -86,7 +86,7 @@ swig_wrap.cpp libSALOME_Comm.py : $(SWIGSOURCES)
 
 CLEANFILES = swig_wrap.cpp
 
-EXTRA_DIST = $(SWIGSOURCES)
+EXTRA_DIST += $(SWIGSOURCES)
 
 #
 # ===============================================================
index db96c558c9b70003bcff5de964b1fb7ca707809d..071c9e3d3c641c80fc92e235617d92c7f63b0d9d 100644 (file)
@@ -72,7 +72,7 @@ _calcium_la_LIBADD = ../DSC_User/Datastream/Calcium/libCalciumC.la \
 
 _calcium_la_CPPFLAGS = $(PYTHON_INCLUDES) $(COMMON_CPPFLAGS)
 
-EXTRA_DIST=calcium_wrap.cpp calcium.i
+EXTRA_DIST+=calcium_wrap.cpp calcium.i
 
 calcium_wrap.cpp calcium.py:calcium.i
        $(SWIG) $(MY_SWIG_FLAGS) -o calcium_wrap.cpp $<
index eaca62a3c5574fe055856b468b1c2be0f2b3c43a..99c0dac48da7b1723738fae7f5f23601d7497ab0 100755 (executable)
@@ -41,14 +41,18 @@ SET_TARGET_PROPERTIES(SalomeDatastream PROPERTIES COMPILE_FLAGS "${BOOST_DEFINIT
 TARGET_LINK_LIBRARIES(SalomeDatastream ${COMMON_LIBS})
 INSTALL(TARGETS SalomeDatastream DESTINATION ${KERNEL_salomelib_LIBS})
 
-FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-SET(NOINST_HEADERS_HXX
-  ProcessTimeIntervalTraits.hxx
-  AdjacentPredicate.hxx
+SET(COMMON_HEADERS_HXX
+  AdjacentFunctor.hxx
+  ConstTraits.hxx
+  CorbaTypeManipulator.hxx
+  CouplingPolicy.hxx
+  DataIdFilter.hxx
+  DisplayPair.hxx
+  FindKeyPredicate.hxx
+  GenericPort.hxx
+  GenericProvidesPort.hxx
+  GenericUsesPort.hxx
+  IteratorTraits.hxx
 )
-FOREACH(HEADER ${NOINST_HEADERS_HXX})
-  LIST(REMOVE_ITEM COMMON_HEADERS_HXX ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER})
-ENDFOREACH(HEADER ${NOINST_HEADERS_HXX})
 
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS})
-
index ef281ec42800851842ddd3913d5a7d2bade8a5c1..f0613a763ad90bf5a34ed43253a91d1067665405 100755 (executable)
@@ -74,16 +74,41 @@ CONFIGURE_FILE(calcium_integer_port_uses.hxx.in calcium_integer_port_uses.hxx @O
 CONFIGURE_FILE(CalciumProvidesPort.hxx.in CalciumProvidesPort.hxx @ONLY)
 CONFIGURE_FILE(CalciumFortranInt.h.in CalciumFortranInt.h @ONLY)
 
-FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 SET(COMMON_HEADERS
-  ${COMMON_HEADERS_HXX}
-  ${COMMON_HEADERS_H}
-  calcium.hf  
-  ${CMAKE_CURRENT_BINARY_DIR}/calcium_integer_port_uses.hxx
-  ${CMAKE_CURRENT_BINARY_DIR}/CalciumProvidesPort.hxx
+  Calcium.hxx
+  CalciumCInterface.hxx
+  CalciumCouplingPolicy.hxx
+  CalciumCxxInterface.hxx
+  CalciumException.hxx
+  CalciumGenericProvidesPort.hxx
+  CalciumGenericUsesPort.hxx
+  CalciumInterface.hxx
+  CalciumMacroCInterface.hxx
+  CalciumPortTraits.hxx
+  CalciumTypes.hxx
+  CalciumTypes2CorbaTypes.hxx
+  Copy2CorbaSpace.hxx
+  Copy2UserSpace.hxx
+  CorbaTypes2CalciumTypes.hxx
+  calcium_complex_port_uses.hxx
+  calcium_double_port_uses.hxx
+  calcium_intc_port_uses.hxx
+  calcium_logical_port_uses.hxx
+  calcium_long_port_uses.hxx
+  calcium_port_factory.hxx
+  calcium_provides_port.hxx
+  calcium_real_port_uses.hxx
+  calcium_string_port_uses.hxx
+  calcium_uses_port.hxx
+  calcium.h
+  calcium.hf
+  calciumE.h
+  calciumP.h
+  calciumf.h
+  fortoc.h
+  version.h
   ${CMAKE_CURRENT_BINARY_DIR}/CalciumFortranInt.h
+  ${CMAKE_CURRENT_BINARY_DIR}/CalciumProvidesPort.hxx
+  ${CMAKE_CURRENT_BINARY_DIR}/calcium_integer_port_uses.hxx
 )
-LIST(REMOVE_ITEM COMMON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/fortoc.h)
-LIST(REMOVE_ITEM COMMON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/CalciumTypesManipulator.hxx)
 INSTALL(FILES ${COMMON_HEADERS} DESTINATION ${KERNEL_salomeinclude_HEADERS})
index deff2298c36af019b467ebaad7ae86ffdf3b0372..0e12027b3cc63fc89cc008d502373808d72df0b8 100644 (file)
@@ -66,7 +66,7 @@ salomeinclude_HEADERS = calcium_port_factory.hxx \
 
 nodist_salomeinclude_HEADERS = calcium_integer_port_uses.hxx CalciumProvidesPort.hxx CalciumFortranInt.h
 
-EXTRA_DIST=fortoc.h calcium_integer_port_uses.hxx.in CalciumProvidesPort.hxx.in CalciumFortranInt.h.in
+EXTRA_DIST+=fortoc.h calcium_integer_port_uses.hxx.in CalciumProvidesPort.hxx.in CalciumFortranInt.h.in
 
 calcium_integer_port_uses.hxx: calcium_integer_port_uses.hxx.in
 CalciumProvidesPort.hxx     : CalciumProvidesPort.hxx.in
index e182b2dc844589b0e8221e331fa72db6297a5735..e2f44cabb41bc6a556b4bb1faf530046c210d2a3 100644 (file)
@@ -24,6 +24,8 @@
 #  Author : André RIBES (EDF)
 #  Module : KERNEL
 #
+include $(top_srcdir)/salome_adm/unix/make_common_starter.am
+
 SUBDIRS_COMMON = DSC_Basic 
 
 if !WINDOWS
@@ -36,6 +38,6 @@ endif
 
 SUBDIRS = $(SUBDIRS_COMMON) $(SUBDIRS_ADD) $(SUBDIR_PAR) 
 
-EXTRA_DIST= DSC.dox
+EXTRA_DIST+= DSC.dox
 
 DIST_SUBDIRS = DSC_Basic DSC_User DSC_Python ParallelDSC
index dd302fb1d6c4411acb7b195fe7df0c9b6a104401..d65b85edd0c653cc1a901169e27206b9d1d9db81 100644 (file)
@@ -102,7 +102,7 @@ libSalomeHDFPersist_la_CPPFLAGS = @HDF5_INCLUDES@ -D@MACHINE@
 
 libSalomeHDFPersist_la_LIBADD   = @HDF5_LIBS@
 
-EXTRA_DIST = \
+EXTRA_DIST += \
   test1.c \
   test2.c \
   test3.cxx \
index 81a420ca47e58f4841d539e012e4b3c0b9acac62..2c1b96b8c26305a60ce62e20a617f098d7a50db4 100644 (file)
@@ -79,7 +79,7 @@ swig_wrap.cpp libSALOME_LifeCycleCORBA.py : $(SWIGSOURCES)
 
 CLEANFILES = swig_wrap.cpp
 
-EXTRA_DIST = $(SWIGSOURCES)
+EXTRA_DIST += $(SWIGSOURCES)
 
 #
 # ===============================================================
index 30d72430e467a82d94f077aac3fbf0b36a56db9a..598d9e7906ee81fdb8b06168d18387118b6aa009 100644 (file)
@@ -25,6 +25,9 @@
 #  Module : KERNEL
 # $Header$
 #
+
+include $(top_srcdir)/salome_adm/unix/make_common_starter.am
+
 SUBDIR_BASE = \
   Basics \
   SALOMELocalTrace \
@@ -129,4 +132,4 @@ if WITH_PACO_PARALLEL
 endif
 
 endif
-EXTRA_DIST = win32pm
+EXTRA_DIST += win32pm
index be3b14f337e974646d602f4065c63db7e00df5ca..31d036665ef976d2f80b0a8521f26de92b8abde2 100644 (file)
@@ -29,7 +29,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 dist_salomescript_PYTHON = IDLparser.py
 
-EXTRA_DIST = tests
+EXTRA_DIST += tests
 
 install-data-hook:
        @for f in $(dist_salomescript_PYTHON) ; do \
index 2957b8e7eed7224b813c7b0df010b699e582edd5..2036a6038a0aff01bbd8b64bf75cff3b096a287c 100644 (file)
@@ -61,4 +61,4 @@ swig_wrap.cpp libNOTIFICATION.py : $(SWIGSOURCES)
 
 CLEANFILES = swig_wrap.cpp
 
-EXTRA_DIST = $(SWIGSOURCES)
+EXTRA_DIST += $(SWIGSOURCES)
index 3076b5821376721b5ed007bbba87e952285cdd5f..4394dd9cc8f7defe1fdd28f87ca33f49256f65d0 100644 (file)
@@ -96,7 +96,7 @@ libSALOMEDSTest_la_CPPFLAGS = $(COMMON_CPPFLAGS)
 libSALOMEDSTest_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 libSALOMEDSTest_la_LIBADD    = $(COMMON_LIBS)
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        SALOMEDSTest_AttributeComment.cxx \
        SALOMEDSTest_AttributeDrawable.cxx \
        SALOMEDSTest_AttributeExpandable.cxx \