SALOME versioning system improvement

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..fa9da45ed69e289221a102625e7ca46f01b90467 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,10 +40,12 @@ 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
+
+# copy header files in common directory
+ifneq ($(HAVE_SSTREAM),yes)
+       include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
@@ -65,6 +67,9 @@ include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+include/salome/GHS3DPLUGIN_version.h: GHS3DPLUGIN_version.h
+       cp $< $@
+
 # install script in $(bindir) :
 install-bin: $(BIN_SCRIPT)
        $(INSTALL) -d  $(bindir)

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..be7f7ccf0fd0b9688a0521df387d6a18a378bf7d 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