From c55501d977dee7a4964206d31413a640d42bf1cc Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:50:03 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- INSTALL | 8 +---- Makefile.in | 23 ++++++++++--- SIERPINSKY_version.h.in | 34 +++++++++++++++++++ .../unix/config_files/check_SIERPINSKY.m4 | 9 ++++- adm_local/unix/make_commence.in | 30 ++++++++++++---- bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 22 ++++++------ idl/Makefile.in | 2 +- ...KYCatalog.xml => SIERPINSKYCatalog.xml.in} | 2 +- src/Sierpinsky/Makefile.in | 6 ++-- src/SierpinskyGUI/Makefile.in | 6 ++-- 12 files changed, 106 insertions(+), 38 deletions(-) create mode 100644 SIERPINSKY_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename resources/{SIERPINSKYCatalog.xml => SIERPINSKYCatalog.xml.in} (99%) diff --git a/INSTALL b/INSTALL index 7cd600c..db625a3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1 @@ -This is the version 0.2 of SIERPINSKY module -Requires : - - SALOME KERNEL 3.0.2 - - SALOME GUI 3.0.2 - - SALOME MED 3.0.2 - - SALOME VISU 3.0.2 - - RANDOMIZER 0.2 +SALOME2 : SIERPINSKY module (sample) diff --git a/Makefile.in b/Makefile.in index ca3a461..0c61cf4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,8 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl + @COMMENCE@ @@ -26,14 +27,22 @@ RESOURCES_FILES = \ BIN_SCRIPT = VERSION # copy header files in common directory -ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h -else - include_list=include/salome/SALOMEconfig.h include/salome/sstream + +include_list = include/salome/SALOMEconfig.h \ + include/salome/SIERPINSKY_version.h + +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(include_list) +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref -$(RM) $@ $(LN_S) ../../$< $@ @@ -51,6 +60,10 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/SIERPINSKY_version.h: SIERPINSKY_version.h + -$(RM) $@ + $(LN_S) ../../$< $@ + depend: depend_idl depend_idl: diff --git a/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in new file mode 100644 index 0000000..c3c023f --- /dev/null +++ b/SIERPINSKY_version.h.in @@ -0,0 +1,34 @@ +// Copyright (C) 2005 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/ +// +// File : SIERPINSKY_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__SIERPINSKY_VERSION_H__) +#define __SIERPINSKY_VERSION_H__ + +/* + SIERPINSKY_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define SIERPINSKY_VERSION_STR "@VERSION@" +#define SIERPINSKY_VERSION @XVERSION@ + +#endif // __SIERPINSKY_VERSION_H__ diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4 index 2b64e64..34cbc06 100755 --- a/adm_local/unix/config_files/check_SIERPINSKY.m4 +++ b/adm_local/unix/config_files/check_SIERPINSKY.m4 @@ -34,14 +34,21 @@ if test "x$SIERPINSKY_DIR" = "x" ; then fi -if test -f ${SIERPINSKY_DIR}/lib/salome/libSIERPINSKY.so ; then +if test -f ${SIERPINSKY_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libSIERPINSKY.so ; then Sierpinsky_ok=yes AC_MSG_RESULT(Using SIERPINSKY module distribution in ${SIERPINSKY_DIR}) if test "x$SIERPINSKY_ROOT_DIR" == "x" ; then SIERPINSKY_ROOT_DIR=${SIERPINSKY_DIR} fi + + SIERPINSKY_LDFLAGS=-L${SIERPINSKY_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + SIERPINSKY_CXXFLAGS=-I${SIERPINSKY_ROOT_DIR}/include/salome + AC_SUBST(SIERPINSKY_ROOT_DIR) + AC_SUBST(SIERPINSKY_LDFLAGS) + AC_SUBST(SIERPINSKY_CXXFLAGS) + else AC_MSG_WARN("Cannot find compiled SIERPINSKY module distribution") fi diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 6e6bd28..a84dfbb 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -17,8 +17,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ LIBSFORBIN=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome -LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(KERNEL_ROOT_DIR)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ LDFLAGSFORBIN+= -lstdc++ @@ -63,8 +63,8 @@ PYTHON_VERSION = @PYTHON_VERSION@ # Changes from the SalomePro V1.2c #PYTHON_SITE = @PYTHON_SITE@ #PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ -PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome +PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome # QT @@ -214,16 +214,34 @@ INSTALL_DATA=@INSTALL_DATA@ # create a symbolic link (or a copie ?) LN_S=@LN_S@ +KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ + +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ +KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ + +GUI_ROOT_DIR=@GUI_ROOT_DIR@ +GUI_LDFLAGS=@GUI_LDFLAGS@ +GUI_CXXFLAGS=@GUI_CXXFLAGS@ + +MED_ROOT_DIR=@MED_ROOT_DIR@ +MED_LDFLAGS=@MED_LDFLAGS@ +MED_CXXFLAGS=@MED_CXXFLAGS@ + +RANDOMIZER_ROOT_DIR=@RANDOMIZER_ROOT_DIR@ +RANDOMIZER_CXXFLAGS=@RANDOMIZER_CXXFLAGS@ +RANDOMIZER_LDFLAGS=@RANDOMIZER_LDFLAGS@ + ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@/salome -libdir=@libdir@/salome +libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome # warning : if user give this path in configure we could have salome/salome :-( includedir=@includedir@/salome datadir=@datadir@/salome idldir=$(prefix)/idl/salome -sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules incmakedir=${prefix}/salome_adm/unix docdir=$(datadir)/doc diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index 1f21a15..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SIERPINSKY COMPONENT - VERSION: 0.2 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..76cd9ff --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SIERPINSKY COMPONENT - VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index 9858e28..d3530f5 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,10 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=0.0.1 +VERSION=3.2.0 +XVERSION=0x030200 AC_SUBST(VERSION) +AC_SUBST(XVERSION) dnl dnl Initialize source and build root directories @@ -113,14 +115,6 @@ dnl AC_CXX_HAVE_SSTREAM -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - dnl dnl --------------------------------------------- dnl testing MPICH @@ -241,6 +235,14 @@ echo CHECK_HDF5 +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + echo echo --------------------------------------------- echo testing MED2 @@ -371,7 +373,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/idl/Makefile.in b/idl/Makefile.in index 31e2cb3..440eb3a 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -30,7 +30,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) lib: pyidl -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ +PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) diff --git a/resources/SIERPINSKYCatalog.xml b/resources/SIERPINSKYCatalog.xml.in similarity index 99% rename from resources/SIERPINSKYCatalog.xml rename to resources/SIERPINSKYCatalog.xml.in index 21828a4..988bbc0 100644 --- a/resources/SIERPINSKYCatalog.xml +++ b/resources/SIERPINSKYCatalog.xml.in @@ -8,7 +8,7 @@ Sierpinsky OTHER Vadim SANDLER (VSR) - 0.2 + @VERSION@ unknown 0 SIERPINSKY.png diff --git a/src/Sierpinsky/Makefile.in b/src/Sierpinsky/Makefile.in index bac9125..cf1c2c7 100644 --- a/src/Sierpinsky/Makefile.in +++ b/src/Sierpinsky/Makefile.in @@ -23,9 +23,9 @@ LIB_SRC = SIERPINSKY_Gen_i.cxx LIB_SERVER_IDL = Sierpinsky.idl MED.idl LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl SALOME_GenericObj.idl SALOME_Comm.idl -CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome $(HDF5_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) +CPPFLAGS += $(KERNEL_CXXFLAGS) $(HDF5_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -LDFLAGSFORBIN += -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase +LDFLAGS += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper +LDFLAGSFORBIN += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase @CONCLUDE@ diff --git a/src/SierpinskyGUI/Makefile.in b/src/SierpinskyGUI/Makefile.in index cde2f8f..9cfa016 100644 --- a/src/SierpinskyGUI/Makefile.in +++ b/src/SierpinskyGUI/Makefile.in @@ -33,10 +33,10 @@ LIB_MOC = \ LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl Sierpinsky.idl Randomizer.idl \ SALOME_GenericObj.idl SALOMEDS_Attributes.idl SALOME_Comm.idl MED.idl VISU_Gen.idl -CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) +CPPFLAGS+= $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${RANDOMIZER_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome $(QT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lSalomeApp -lSIERPINSKYEngine -L${RANDOMIZER_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/include/salome -lSalomeLifeCycleCORBA +LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA @CONCLUDE@ -- 2.39.2