From 567cd3272b657d4f92b63222aca26b8a5a749d8d Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 25 May 2006 12:39:16 +0000
Subject: [PATCH] SALOME versioning system improvement

---
 GUI_version.h.in                              | 34 +++++++++++++++++++
 INSTALL                                       |  4 +--
 Makefile.in                                   | 22 ++++++------
 bin/VERSION                                   |  1 -
 bin/VERSION.in                                |  1 +
 configure.in.base                             |  4 ++-
 doc/salome/tui/Makefile.in                    |  1 +
 doc/salome/tui/SUIT/{doxyfile => doxyfile.in} |  2 +-
 8 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 GUI_version.h.in
 delete mode 100755 bin/VERSION
 create mode 100755 bin/VERSION.in
 rename doc/salome/tui/SUIT/{doxyfile => doxyfile.in} (99%)

diff --git a/GUI_version.h.in b/GUI_version.h.in
new file mode 100644
index 000000000..9a5df78eb
--- /dev/null
+++ b/GUI_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   : GUI_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__GUI_VERSION_H__)
+#define __GUI_VERSION_H__
+
+/*
+  GUI_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define GUI_VERSION_STR "@VERSION@"
+#define GUI_VERSION     @XVERSION@
+
+#endif // __GUI_VERSION_H__
diff --git a/INSTALL b/INSTALL
index 537aa3872..31600814e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1 @@
-This is the version 3.2.0b1 of SALOMEGUI
-Compatible with :
-        - KERNEL 3.2.0b1
+SALOME2 : GUI module
diff --git a/Makefile.in b/Makefile.in
index 29e946483..d1a9db49d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,18 +99,15 @@ runLightSalome.sh
 # copy header files in common directory
 OWN_CONFIG_H=@OWN_CONFIG_H@
 
+include_list = include/salome/SALOMEconfig.h \
+               include/salome/GUI_version.h
+
 ifeq ($(OWN_CONFIG_H),yes)
-    ifeq ($(HAVE_SSTREAM),yes)
-	include_list=include/salome/SALOMEconfig.h include/salome/config.h
-    else
-	include_list=include/salome/SALOMEconfig.h include/salome/config.h include/salome/sstream
-    endif
-else
-    ifeq ($(HAVE_SSTREAM),yes)
-	include_list=include/salome/SALOMEconfig.h
-    else
-	include_list=include/salome/SALOMEconfig.h include/salome/sstream
-    endif
+	include_list += include/salome/config.h
+endif
+
+ifneq ($(HAVE_SSTREAM),yes)
+	include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
@@ -136,6 +133,9 @@ include/salome/sstream: salome_adm/unix/sstream
 	-$(RM) $@
 	$(LN_S) ../../$< $@
 
+include/salome/GUI_version.h: GUI_version.h
+	cp $< $@
+
 depend:
 #depend: depend_idl
 #depend_idl:
diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755
index 45addf10a..000000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SALOME - SALOMEGUI VERSION: 3.2.0b1
diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755
index 000000000..1582d527a
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SALOME - SALOMEGUI VERSION: @VERSION@
diff --git a/configure.in.base b/configure.in.base
index 86fc9ff5d..0fbcf69ca 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,8 +23,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)
 
 ########################################################################
 # Check --disable-corba option
diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in
index 728359b43..8acf51fda 100644
--- a/doc/salome/tui/Makefile.in
+++ b/doc/salome/tui/Makefile.in
@@ -18,6 +18,7 @@ doxygen=@DOXYGEN@
 
 docs:
 	cp -fr $(srcdir)/SUIT ./INPUT; \
+	cp -f ./SUIT/doxyfile ./INPUT; \
 	cd INPUT; \
 	sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \
 	sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
diff --git a/doc/salome/tui/SUIT/doxyfile b/doc/salome/tui/SUIT/doxyfile.in
similarity index 99%
rename from doc/salome/tui/SUIT/doxyfile
rename to doc/salome/tui/SUIT/doxyfile.in
index 949d9cd76..b08c01549 100755
--- a/doc/salome/tui/SUIT/doxyfile
+++ b/doc/salome/tui/SUIT/doxyfile.in
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GUI - v.version"
+PROJECT_NAME           = "SALOME - GUI - v.@VERSION@"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = ../
 CREATE_SUBDIRS         = NO
-- 
2.39.2