Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/GHS3DPLUGIN_version.h.in b/GHS3DPLUGIN_version.h.in
new file mode 100644 (file)
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 50ad9ae14955d0f0c5a47bc7b56d136e5732737d..937a961091acf92d260b109e83f3b8992ce7dc3f 100644 (file)
--- 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 39be8ca8482962b3b651a00fb1daef95294fcf7c..3fc3cd3b082d401f3ee689d1325025d188e2cac2 100644 (file)
--- 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 82d3a12b3df7c2bee031ae1e4282ea64ae3e5304..c982e28b890ca87ed5f5c43fd9ef2ccc17d08af5 100644 (file)
--- 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 1d36f9ce17601abdacda3d5e41b42e751f46968a..ffd162834a1c0c70886df9b7fee7459c3d2313b6 100755 (executable)
--- 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 1f111d0a4b1a52bd2ce697f51ef9d2ce4e439ec7..79373ac5cb364e882b6b5acb9d08e532b79dd4fb 100644 (file)
--- 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 (executable)
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 (executable)
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 3a29cbde670b8e2322d32244b2c76ef6255aaca2..4ffaf295cfdece312b1a2e8bc7873e8d000ff97b 100644 (file)
--- 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 d5f961d96496e4fcfcaabe2a676508c8f5b88fa7..f698e9fe099f054b43bad7dabc309c4bdc6967c5 100644 (file)
--- 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 0325f6d89130bcb92ebaf6cfd86891c3a9031fb2..f4a3c6672defee99ddfe690e004aecffd8cc68d7 100644 (file)
--- 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 19a9afe490d4071e1a1c73542516e430d3495e31..cf89cf863f09c44cc02b1543e120efb655687cf5 100644 (file)
--- 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 b71554b01ccab98da060c59ae44af31a759be840..a3855abc2e4f5cc93c42fda957e7d81258684c7f 100644 (file)
--- 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 72a1b36a1ff419022219abe2802c8c40ac928afd..9330cc73f17ce29107ba7c5aa3bff3a5af515864 100644 (file)
--- 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 bb688386bcba12a88d7ad22bf2a941c7ab35baa1..61dfc36d13df04973c1c9e4d2f919cc57caead8d 100644 (file)
--- 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 4e2c9e67a7b9e41f818d975d1a0a81efb93fffc1..1622f607f940d61e6f0dd74137b9ef875dd7d3cf 100644 (file)
--- 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 df67c55aa3dd0d57a0d741332d2901759690a6dc..a03d771693b402bafc95bbf103af1fb9cbe1dbef 100644 (file)
--- 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 b43192f8ba5c36e7dbacfe18d6b2f6a8aa50d5b2..42bd7fffe339752ba4a2dd36a1dd59cfa7c11438 100644 (file)
--- 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 *- 
 #