From 61747cfacb07fcb922e6b34a9fd0cb960e9ef99a Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 25 May 2006 13:46:10 +0000 Subject: [PATCH] SALOME versioning system improvement --- INSTALL | 7 +--- Makefile.in | 14 +++++--- SMESH_version.h.in | 34 +++++++++++++++++++ bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 4 ++- doc/salome/tui/Makefile.in | 4 +-- .../tui/SMESH/{doxyfile => doxyfile.in} | 2 +- .../tui/SMESH/{doxyfile_py => doxyfile_py.in} | 2 +- .../sources/static/{tree.js => tree.js.in} | 2 +- .../{SMESHCatalog.xml => SMESHCatalog.xml.in} | 2 +- 11 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 SMESH_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename doc/salome/tui/SMESH/{doxyfile => doxyfile.in} (99%) rename doc/salome/tui/SMESH/{doxyfile_py => doxyfile_py.in} (99%) rename doc/salome/tui/SMESH/sources/static/{tree.js => tree.js.in} (96%) rename resources/{SMESHCatalog.xml => SMESHCatalog.xml.in} (99%) diff --git a/INSTALL b/INSTALL index 6d03e0a4a..0ea0b81cb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1 @@ -This is the version 3.2.0b1 of SMESH -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 - - GEOM 3.2.0b1 - - MED 3.2.0b1 +SALOME2 : SMESH module diff --git a/Makefile.in b/Makefile.in index c74723194..2c8ff8b11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,7 +28,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:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ @@ -168,11 +168,12 @@ mesh_conv_to_quad.png BIN_SCRIPT= \ VERSION +include_list = include/salome/SALOMEconfig.h \ + include/salome/SMESH_version.h + # 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 +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(include_list) @@ -194,6 +195,9 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/SMESH_version.h: SMESH_version.h + cp $< $@ + depend: depend_idl depend_idl: diff --git a/SMESH_version.h.in b/SMESH_version.h.in new file mode 100644 index 000000000..85259c4e3 --- /dev/null +++ b/SMESH_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 : SMESH_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__SMESH_VERSION_H__) +#define __SMESH_VERSION_H__ + +/* + SMESH_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define SMESH_VERSION_STR "@VERSION@" +#define SMESH_VERSION @XVERSION@ + +#endif // __SMESH_VERSION_H__ diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index a32989223..000000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - SMESH VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 000000000..fa49d303f --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - SMESH VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index fe318e136..cc915a120 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 diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in index ae4ace2f7..1c8e84332 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -21,11 +21,11 @@ PYTHON_SCRIPTS = \ docs: cp -fr $(srcdir)/SMESH ./INPUT; \ + cp -fr ./SMESH/doxyfile ./SMESH/doxyfile_py ./INPUT cd INPUT; \ sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - sed "s|version|`cut -d: -f2 $(root_srcdir)/bin/VERSION`|" ./doxyfile2 > ./doxyfile3; \ - mv -f doxyfile3 doxyfile1; \ + mv -f doxyfile2 doxyfile1; \ if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ diff --git a/doc/salome/tui/SMESH/doxyfile b/doc/salome/tui/SMESH/doxyfile.in similarity index 99% rename from doc/salome/tui/SMESH/doxyfile rename to doc/salome/tui/SMESH/doxyfile.in index 5c0c6bca1..e9705fdea 100755 --- a/doc/salome/tui/SMESH/doxyfile +++ b/doc/salome/tui/SMESH/doxyfile.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SMESH - v.version" +PROJECT_NAME = "SALOME - SMESH - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO diff --git a/doc/salome/tui/SMESH/doxyfile_py b/doc/salome/tui/SMESH/doxyfile_py.in similarity index 99% rename from doc/salome/tui/SMESH/doxyfile_py rename to doc/salome/tui/SMESH/doxyfile_py.in index ba0d3393f..78d1407fd 100755 --- a/doc/salome/tui/SMESH/doxyfile_py +++ b/doc/salome/tui/SMESH/doxyfile_py.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SMESH - v.version" +PROJECT_NAME = "SALOME - SMESH - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO diff --git a/doc/salome/tui/SMESH/sources/static/tree.js b/doc/salome/tui/SMESH/sources/static/tree.js.in similarity index 96% rename from doc/salome/tui/SMESH/sources/static/tree.js rename to doc/salome/tui/SMESH/sources/static/tree.js.in index ef81ae08e..36d021fcb 100755 --- a/doc/salome/tui/SMESH/sources/static/tree.js +++ b/doc/salome/tui/SMESH/sources/static/tree.js.in @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.3.2.0b1 ", "", "") +foldersTree = gFld("SALOME v.@VERSION@ ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/resources/SMESHCatalog.xml b/resources/SMESHCatalog.xml.in similarity index 99% rename from resources/SMESHCatalog.xml rename to resources/SMESHCatalog.xml.in index bbc8e1b8a..d5d2bb072 100644 --- a/resources/SMESHCatalog.xml +++ b/resources/SMESHCatalog.xml.in @@ -16,7 +16,7 @@ Mesh MESH NRI - 3.2.0b1 + @VERSION@ Mesh component 1 ModuleMesh.png -- 2.30.2