From 41bd6808ab9259cb95b9e36cf1544fcb74e0fed7 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:43:58 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- GHS3DPLUGIN_version.h.in | 34 +++++++++++++++++++ INSTALL | 6 +--- Makefile.in | 33 ++++++++++++++---- adm_local/Makefile.in | 2 +- .../unix/config_files/check_GHS3DPLUGIN.m4 | 7 ++++ adm_local/unix/make_commence.in | 21 +++++++++--- bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 22 ++++++------ idl/GHS3DPlugin_Algorithm.idl | 2 +- idl/Makefile.in | 5 +-- src/GHS3DPlugin_GHS3D.cxx | 2 +- src/GHS3DPlugin_GHS3D.hxx | 2 +- src/GHS3DPlugin_GHS3D_i.cxx | 2 +- src/GHS3DPlugin_GHS3D_i.hxx | 2 +- src/GHS3DPlugin_i.cxx | 2 +- src/GHS3DPlugin_icons.po | 2 +- src/Makefile.in | 2 +- 18 files changed, 110 insertions(+), 38 deletions(-) create mode 100644 GHS3DPLUGIN_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in diff --git a/GHS3DPLUGIN_version.h.in b/GHS3DPLUGIN_version.h.in new file mode 100644 index 0000000..38e1172 --- /dev/null +++ b/GHS3DPLUGIN_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 : GHS3DPLUGIN_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__GHS3DPLUGIN_VERSION_H__) +#define __GHS3DPLUGIN_VERSION_H__ + +/* + GHS3DPLUGIN_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define GHS3DPLUGIN_VERSION_STR "@VERSION@" +#define GHS3DPLUGIN_VERSION @XVERSION@ + +#endif // __GHS3DPLUGIN_VERSION_H__ diff --git a/INSTALL b/INSTALL index 50ad9ae..937a961 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1 @@ -This is the version 3.2.0b1 of GHS3DPLUGIN -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 - - SMESH 3.2.0b1 +SALOME2 : GHS3DPLUGIN module (SMESH plugin) diff --git a/Makefile.in b/Makefile.in index 39be8ca..3fc3cd3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- # @@ -27,7 +27,7 @@ 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:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ @@ -40,14 +40,21 @@ 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/GHS3DPLUGIN_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) ../../$< $@ @@ -65,6 +72,18 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/GHS3DPLUGIN_version.h: GHS3DPLUGIN_version.h + -$(RM) $@ + $(LN_S) ../../$< $@ + +install-include: $(include_list) + $(INSTALL) -d $(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ + ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ + fi; \ + done + # install script in $(bindir) : install-bin: $(BIN_SCRIPT) $(INSTALL) -d $(bindir) @@ -84,4 +103,4 @@ distclean-other: @MODULE@ -install: install-bin +install: install-bin install-include diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 82d3a12..c982e28 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # source path top_srcdir=@top_srcdir@ diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 index 1d36f9c..ffd1628 100755 --- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 +++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 @@ -5,6 +5,9 @@ AC_DEFUN([CHECK_GHS3DPLUGIN],[ +GHS3DPLUGIN_LDFLAGS="" +GHS3DPLUGIN_CXXFLAGS="" + AC_CHECKING(for GHS3dPlugin) GHS3dPlugin_ok=no @@ -41,7 +44,11 @@ if test -f ${GHS3DPLUGIN_DIR}/lib/salome/libGHS3DEngine.so ; then if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR} fi + GHS3DPLUGIN_CXXFLAGS+=-I${GHS3DPLUGIN_ROOT_DIR}/include/salome + GHS3DPLUGIN_LDFLAGS+=-L${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome AC_SUBST(GHS3DPLUGIN_ROOT_DIR) + AC_SUBST(GHS3DPLUGIN_LDFLAGS) + AC_SUBST(GHS3DPLUGIN_CXXFLAGS) else AC_MSG_WARN("Cannot find compiled GHS3DPLUGIN module distribution") fi diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 1f111d0..79373ac 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome +LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ @@ -172,7 +172,7 @@ SALOME_INCLUDES = \ CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS) CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES) -LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj +LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine $(KERNEL_LDFLAGS) $(SMESH_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeGenericObj # add corba libs when link salome application ! #LDFLAGS+= $(CORBA_LIBS) @@ -198,16 +198,29 @@ 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@ + +GEOM_ROOT_DIR=@GEOM_ROOT_DIR@ +GEOM_LDFLAGS=@GEOM_LDFLAGS@ +GEOM_CXXFLAGS=@GEOM_CXXFLAGS@ + +SMESH_ROOT_DIR=@SMESH_ROOT_DIR@ +SMESH_LDFLAGS=@SMESH_LDFLAGS@ +SMESH_CXXFLAGS=@SMESH_CXXFLAGS@ + ## 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 docdir=${prefix}/doc/salome diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index 8815365..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - GHS3DPLUGIN VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..777656f --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - GHS3DPLUGIN VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index 3a29cbd..4ffaf29 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 @@ -239,6 +233,14 @@ echo Testing OpenCascade echo --------------------------------------------- echo +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + CHECK_CAS echo @@ -355,7 +357,7 @@ fi # make other build directories for rep in \ - salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources #idl + salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources #idl do # if test ! -d $rep ; then # eval mkdir $rep diff --git a/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl index d5f961d..f698e9f 100644 --- a/idl/GHS3DPlugin_Algorithm.idl +++ b/idl/GHS3DPlugin_Algorithm.idl @@ -15,7 +15,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/idl/Makefile.in b/idl/Makefile.in index 0325f6d..f4a3c66 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # generate dependencies for idl file : @@ -31,6 +31,7 @@ VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome :${SMESH_ROOT_ IDL_FILES = GHS3DPlugin_Algorithm.idl +LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@ # copy all idl file in $(top_builddir)/idl inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) @@ -45,7 +46,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) # python wrap 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/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx index 19a9afe..cf89cf8 100644 --- a/src/GHS3DPlugin_GHS3D.cxx +++ b/src/GHS3DPlugin_GHS3D.cxx @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //============================================================================= // File : GHS3DPlugin_GHS3D.cxx diff --git a/src/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin_GHS3D.hxx index b71554b..a3855ab 100644 --- a/src/GHS3DPlugin_GHS3D.hxx +++ b/src/GHS3DPlugin_GHS3D.hxx @@ -14,7 +14,7 @@ // 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //============================================================================= // File : GHS3DPlugin_GHS3D.hxx diff --git a/src/GHS3DPlugin_GHS3D_i.cxx b/src/GHS3DPlugin_GHS3D_i.cxx index 72a1b36..9330cc7 100644 --- a/src/GHS3DPlugin_GHS3D_i.cxx +++ b/src/GHS3DPlugin_GHS3D_i.cxx @@ -17,7 +17,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GHS3DPlugin_GHS3D_i.hxx b/src/GHS3DPlugin_GHS3D_i.hxx index bb68838..61dfc36 100644 --- a/src/GHS3DPlugin_GHS3D_i.hxx +++ b/src/GHS3DPlugin_GHS3D_i.hxx @@ -15,7 +15,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GHS3DPlugin_i.cxx b/src/GHS3DPlugin_i.cxx index 4e2c9e6..1622f60 100644 --- a/src/GHS3DPlugin_i.cxx +++ b/src/GHS3DPlugin_i.cxx @@ -17,7 +17,7 @@ // 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GHS3DPlugin_icons.po b/src/GHS3DPlugin_icons.po index df67c55..a03d771 100644 --- a/src/GHS3DPlugin_icons.po +++ b/src/GHS3DPlugin_icons.po @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. "Foo::Bar" diff --git a/src/Makefile.in b/src/Makefile.in index b43192f..42bd7ff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,7 +14,7 @@ # 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/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- # -- 2.30.2