From e53a664c5d847eda10adbeb565c24c54613e3135 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 9 Oct 2012 08:35:17 +0000 Subject: [PATCH] 1) Add CMake files to the dist rules (make dist) 2) Fix problems of make dist (missing files) --- Makefile.am | 2 +- doc/Makefile.am | 2 +- doc/docutils/Makefile.am | 2 +- doc/salome/Makefile.am | 4 +- doc/salome/gui/Makefile.am | 2 +- doc/salome/tui/Makefile.am | 2 +- idl/Makefile.am | 2 +- resources/Makefile.am | 2 +- salome_adm/cmake_files/Makefile.am | 1 + salome_adm/unix/make_common_starter.am | 4 ++ src/Communication/CMakeLists.txt | 15 ++++-- src/Communication/Makefile.am | 2 +- src/Communication/Receiver.cxx | 47 ------------------- src/Communication_SWIG/Makefile.am | 2 +- src/DSC/DSC_Python/Makefile.am | 2 +- src/DSC/DSC_User/Datastream/CMakeLists.txt | 20 ++++---- .../Datastream/Calcium/CMakeLists.txt | 43 +++++++++++++---- .../DSC_User/Datastream/Calcium/Makefile.am | 2 +- src/DSC/Makefile.am | 4 +- src/HDFPersist/Makefile.am | 2 +- src/LifeCycleCORBA_SWIG/Makefile.am | 2 +- src/Makefile.am | 5 +- src/ModuleGenerator/Makefile.am | 2 +- src/NOTIFICATION_SWIG/Makefile.am | 2 +- src/SALOMEDS/Test/Makefile.am | 2 +- 25 files changed, 86 insertions(+), 89 deletions(-) delete mode 100644 src/Communication/Receiver.cxx diff --git a/Makefile.am b/Makefile.am index 471d18f5d..abfd02f99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 2cdd838a3..bce7733f8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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 diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am index 9764cb727..36acceb96 100644 --- a/doc/docutils/Makefile.am +++ b/doc/docutils/Makefile.am @@ -33,7 +33,7 @@ RSTFILES = \ kernel.rst \ parametric.rst -EXTRA_DIST = archives $(RSTFILES) +EXTRA_DIST += archives $(RSTFILES) SPHINXOPTS = SOURCEDIR = $(srcdir) diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index a4d7dd4ec..d683bac5a 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -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 diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index f5f8a47db..13cc6565e 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -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 diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index eb465301e..d6ea2af93 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -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 diff --git a/idl/Makefile.am b/idl/Makefile.am index 1347ad5e0..cf953c8e7 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -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 diff --git a/resources/Makefile.am b/resources/Makefile.am index 1e746e530..1881203ef 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -52,4 +52,4 @@ else KERNELCatalog.xml endif -EXTRA_DIST = CatalogDataType.xml +EXTRA_DIST += CatalogDataType.xml diff --git a/salome_adm/cmake_files/Makefile.am b/salome_adm/cmake_files/Makefile.am index b21d38c4e..22ede73e6 100644 --- a/salome_adm/cmake_files/Makefile.am +++ b/salome_adm/cmake_files/Makefile.am @@ -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 diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am index 3842661dd..e5bcd35c1 100644 --- a/salome_adm/unix/make_common_starter.am +++ b/salome_adm/unix/make_common_starter.am @@ -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 diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt index 4d1b1de03..796ffdded 100755 --- a/src/Communication/CMakeLists.txt +++ b/src/Communication/CMakeLists.txt @@ -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}) diff --git a/src/Communication/Makefile.am b/src/Communication/Makefile.am index 6255807a8..391173d17 100644 --- a/src/Communication/Makefile.am +++ b/src/Communication/Makefile.am @@ -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 index ff240bc55..000000000 --- a/src/Communication/Receiver.cxx +++ /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 - -/*! - 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); -} - diff --git a/src/Communication_SWIG/Makefile.am b/src/Communication_SWIG/Makefile.am index 9f03d8b56..bdd171cdb 100644 --- a/src/Communication_SWIG/Makefile.am +++ b/src/Communication_SWIG/Makefile.am @@ -86,7 +86,7 @@ swig_wrap.cpp libSALOME_Comm.py : $(SWIGSOURCES) CLEANFILES = swig_wrap.cpp -EXTRA_DIST = $(SWIGSOURCES) +EXTRA_DIST += $(SWIGSOURCES) # # =============================================================== diff --git a/src/DSC/DSC_Python/Makefile.am b/src/DSC/DSC_Python/Makefile.am index db96c558c..071c9e3d3 100644 --- a/src/DSC/DSC_Python/Makefile.am +++ b/src/DSC/DSC_Python/Makefile.am @@ -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 $< diff --git a/src/DSC/DSC_User/Datastream/CMakeLists.txt b/src/DSC/DSC_User/Datastream/CMakeLists.txt index eaca62a3c..99c0dac48 100755 --- a/src/DSC/DSC_User/Datastream/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/CMakeLists.txt @@ -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}) - diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt index ef281ec42..f0613a763 100755 --- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt @@ -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}) diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am index deff2298c..0e12027b3 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am @@ -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 diff --git a/src/DSC/Makefile.am b/src/DSC/Makefile.am index e182b2dc8..e2f44cabb 100644 --- a/src/DSC/Makefile.am +++ b/src/DSC/Makefile.am @@ -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 diff --git a/src/HDFPersist/Makefile.am b/src/HDFPersist/Makefile.am index dd302fb1d..d65b85edd 100644 --- a/src/HDFPersist/Makefile.am +++ b/src/HDFPersist/Makefile.am @@ -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 \ diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am index 81a420ca4..2c1b96b8c 100644 --- a/src/LifeCycleCORBA_SWIG/Makefile.am +++ b/src/LifeCycleCORBA_SWIG/Makefile.am @@ -79,7 +79,7 @@ swig_wrap.cpp libSALOME_LifeCycleCORBA.py : $(SWIGSOURCES) CLEANFILES = swig_wrap.cpp -EXTRA_DIST = $(SWIGSOURCES) +EXTRA_DIST += $(SWIGSOURCES) # # =============================================================== diff --git a/src/Makefile.am b/src/Makefile.am index 30d72430e..598d9e790 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/ModuleGenerator/Makefile.am b/src/ModuleGenerator/Makefile.am index be3b14f33..31d036665 100644 --- a/src/ModuleGenerator/Makefile.am +++ b/src/ModuleGenerator/Makefile.am @@ -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 \ diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am index 2957b8e7e..2036a6038 100644 --- a/src/NOTIFICATION_SWIG/Makefile.am +++ b/src/NOTIFICATION_SWIG/Makefile.am @@ -61,4 +61,4 @@ swig_wrap.cpp libNOTIFICATION.py : $(SWIGSOURCES) CLEANFILES = swig_wrap.cpp -EXTRA_DIST = $(SWIGSOURCES) +EXTRA_DIST += $(SWIGSOURCES) diff --git a/src/SALOMEDS/Test/Makefile.am b/src/SALOMEDS/Test/Makefile.am index 3076b5821..4394dd9cc 100644 --- a/src/SALOMEDS/Test/Makefile.am +++ b/src/SALOMEDS/Test/Makefile.am @@ -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 \ -- 2.39.2