From f0791ce320201be81a39b516d086d64120e3534a Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 25 May 2006 14:03:15 +0000 Subject: [PATCH] SALOME versioning system improvement --- INSTALL | 6 +--- Makefile.in | 14 +++++--- VISU_version.h.in | 34 +++++++++++++++++++ bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 4 ++- doc/salome/tui/Makefile.in | 4 +-- doc/salome/tui/VISU/{doxyfile => doxyfile.in} | 2 +- .../sources/static/{tree.js => tree.js.in} | 2 +- .../{VISUCatalog.xml => VISUCatalog.xml.in} | 2 +- 10 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 VISU_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename doc/salome/tui/VISU/{doxyfile => doxyfile.in} (99%) rename doc/salome/tui/VISU/sources/static/{tree.js => tree.js.in} (98%) rename resources/{VISUCatalog.xml => VISUCatalog.xml.in} (93%) diff --git a/INSTALL b/INSTALL index f68cc558..79c7a0e6 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1 @@ -This is the version 3.2.0b1 of VISU -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 - - MED 3.2.0b1 +SALOME2 : VISU module diff --git a/Makefile.in b/Makefile.in index 031ff116..3b568b82 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:${KERNEL_ROOT_DIR}/idl/salome +VPATH=.:@srcdir@:@top_srcdir@/bin:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome @COMMENCE@ @@ -39,11 +39,12 @@ VERSION +include_list = include/salome/SALOMEconfig.h \ + include/salome/VISU_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) @@ -65,6 +66,9 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/VISU_version.h: VISU_version.h + cp $< $@ + depend: depend_idl depend_idl: diff --git a/VISU_version.h.in b/VISU_version.h.in new file mode 100644 index 00000000..c0a63cf7 --- /dev/null +++ b/VISU_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 : VISU_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__VISU_VERSION_H__) +#define __VISU_VERSION_H__ + +/* + VISU_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define VISU_VERSION_STR "@VERSION@" +#define VISU_VERSION @XVERSION@ + +#endif // __VISU_VERSION_H__ diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index 9df5f668..00000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - VISU VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 00000000..334c3a64 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - VISU VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index e7e69dd4..a0717524 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 7abdc0ac..9617f967 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -18,11 +18,11 @@ doxygen=@DOXYGEN@ docs: cp -fr $(srcdir)/VISU ./INPUT; \ + cp -fr ./VISU/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/VISU/doxyfile b/doc/salome/tui/VISU/doxyfile.in similarity index 99% rename from doc/salome/tui/VISU/doxyfile rename to doc/salome/tui/VISU/doxyfile.in index 13fad980..53b0ed84 100755 --- a/doc/salome/tui/VISU/doxyfile +++ b/doc/salome/tui/VISU/doxyfile.in @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - VISU - v.version" +PROJECT_NAME = "SALOME - VISU - v.@VERSION@" PROJECT_NUMBER = OUTPUT_DIRECTORY = ../ CREATE_SUBDIRS = NO diff --git a/doc/salome/tui/VISU/sources/static/tree.js b/doc/salome/tui/VISU/sources/static/tree.js.in similarity index 98% rename from doc/salome/tui/VISU/sources/static/tree.js rename to doc/salome/tui/VISU/sources/static/tree.js.in index 25fd55a3..8903b2ab 100755 --- a/doc/salome/tui/VISU/sources/static/tree.js +++ b/doc/salome/tui/VISU/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/VISUCatalog.xml b/resources/VISUCatalog.xml.in similarity index 93% rename from resources/VISUCatalog.xml rename to resources/VISUCatalog.xml.in index c9a60baa..96f7ffab 100644 --- a/resources/VISUCatalog.xml +++ b/resources/VISUCatalog.xml.in @@ -16,7 +16,7 @@ Post-Pro VISU NRI - 3.2.0b1 + @VERSION@ Post-Pro component 1 ModuleVisu.png -- 2.39.2