From 3636cdc114215bb231cf2be460dc7282bbeeeb28 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 25 May 2006 14:47:03 +0000 Subject: [PATCH] SALOME versioning system improvement --- INSTALL | 5 +-- Makefile.in | 14 +++++--- SUPERV_version.h.in | 34 +++++++++++++++++++ bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 4 ++- doc/salome/tui/Makefile.in | 4 +-- .../tui/SUPERV/{doxyfile => doxyfile.in} | 2 +- .../sources/static/{tree.js => tree.js.in} | 2 +- ...SUPERVCatalog.xml => SUPERVCatalog.xml.in} | 2 +- 10 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 SUPERV_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename doc/salome/tui/SUPERV/{doxyfile => doxyfile.in} (99%) rename doc/salome/tui/SUPERV/sources/static/{tree.js => tree.js.in} (98%) rename resources/{SUPERVCatalog.xml => SUPERVCatalog.xml.in} (94%) diff --git a/INSTALL b/INSTALL index 7775821..34f94f6 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1 @@ -This is the version 3.2.0b1 of SUPERV -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 +SALOME2 : SUPERV module diff --git a/Makefile.in b/Makefile.in index b79c130..5685478 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@ @@ -58,11 +58,12 @@ Superv_tree_superv.png BIN_SCRIPT= \ VERSION +include_list = include/salome/SALOMEconfig.h \ + include/salome/SUPERV_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) @@ -84,6 +85,9 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/SUPERV_version.h: SUPERV_version.h + cp $< $@ + depend: depend_idl depend_idl: diff --git a/SUPERV_version.h.in b/SUPERV_version.h.in new file mode 100644 index 0000000..e37f941 --- /dev/null +++ b/SUPERV_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 : SUPERV_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__SUPERV_VERSION_H__) +#define __SUPERV_VERSION_H__ + +/* + SUPERV_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define SUPERV_VERSION_STR "@VERSION@" +#define SUPERV_VERSION @XVERSION@ + +#endif // __SUPERV_VERSION_H__ diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index 29eafc1..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - SUPERV VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..6a76816 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - SUPERV VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index ae9739a..056ea39 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 27a9f21..ddfea3c 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -18,11 +18,11 @@ doxygen=@DOXYGEN@ docs: cp -fr $(srcdir)/SUPERV ./INPUT; \ + cp -fr ./SUPERV/doxyfile ./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; \ echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ diff --git a/doc/salome/tui/SUPERV/doxyfile b/doc/salome/tui/SUPERV/doxyfile.in similarity index 99% rename from doc/salome/tui/SUPERV/doxyfile rename to doc/salome/tui/SUPERV/doxyfile.in index 1ff5f65..567da5c 100755 --- a/doc/salome/tui/SUPERV/doxyfile +++ b/doc/salome/tui/SUPERV/doxyfile.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - SUPERV - v.version" +PROJECT_NAME = "SALOME - SUPERV - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO diff --git a/doc/salome/tui/SUPERV/sources/static/tree.js b/doc/salome/tui/SUPERV/sources/static/tree.js.in similarity index 98% rename from doc/salome/tui/SUPERV/sources/static/tree.js rename to doc/salome/tui/SUPERV/sources/static/tree.js.in index 01df59e..89c1c14 100755 --- a/doc/salome/tui/SUPERV/sources/static/tree.js +++ b/doc/salome/tui/SUPERV/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/SUPERVCatalog.xml b/resources/SUPERVCatalog.xml.in similarity index 94% rename from resources/SUPERVCatalog.xml rename to resources/SUPERVCatalog.xml.in index 2d5cf41..059899e 100644 --- a/resources/SUPERVCatalog.xml +++ b/resources/SUPERVCatalog.xml.in @@ -16,7 +16,7 @@ Supervisor SUPERV ARS - 3.2.0b1 + @VERSION@ Supervisor component 1 ModuleSupervision.png -- 2.39.2