SALOME versioning system improvement

diff --git a/INSTALL b/INSTALL
index b058815d9d7274611c82d489fa146b2a2b085eaa..e1da3497622d40962534edd6f5e22ffe718f1999 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1 @@
-This is the version 3.2.0b1 of NETGENPLUGIN
-Compatible with :
-       - KERNEL 3.2.0b1
-       - SALOMEGUI 3.2.0b1
-        - SMESH 3.2.0b1
+SALOME2 : NETGENPLUGIN module (SMESH plugin)

diff --git a/Makefile.in b/Makefile.in
index 810d124767904457032133403a00f056ebcc03f5..403b4036ace0b94a4c9b8f5ef1c23aeb494fa730 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,10 +50,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/NETGENPLUGIN_version.h
+
+# copy header files in common directory
+ifneq ($(HAVE_SSTREAM),yes)
+       include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
@@ -75,6 +77,9 @@ include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+include/salome/NETGENPLUGIN_version.h: NETGENPLUGIN_version.h
+       cp $< $@
+
 # install script in $(bindir) :
 install-bin: $(BIN_SCRIPT)
        $(INSTALL) -d  $(bindir)

diff --git a/NETGENPLUGIN_version.h.in b/NETGENPLUGIN_version.h.in
new file mode 100644 (file)
index 0000000..349432e
--- /dev/null
+++ b/NETGENPLUGIN_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   : NETGENPLUGIN_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__NETGENPLUGIN_VERSION_H__)
+#define __NETGENPLUGIN_VERSION_H__
+
+/*
+  NETGENPLUGIN_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define NETGENPLUGIN_VERSION_STR "@VERSION@"
+#define NETGENPLUGIN_VERSION     @XVERSION@
+
+#endif // __NETGENPLUGIN_VERSION_H__

diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755 (executable)
index 28be725..0000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SALOME - NETGENPLUGIN VERSION: 3.2.0b1

diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755 (executable)
index 0000000..b5e9383
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SALOME - NETGENPLUGIN VERSION: @VERSION@

diff --git a/configure.in.base b/configure.in.base
index 496ed643f76a139de739df65f12b3b3bce01e81f..42a557a50f6e5e81e854e43daa54c6badcd5aea4 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