ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-28 18:00:49 +05:00
Code Issues Packages Projects Releases Wiki Activity

SALOME versioning system improvement

Browse Source
This commit is contained in:
vsr 2006-05-25 13:24:49 +00:00
parent 6feb4ebf3e
commit 63dfb12f94
11 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
GEOM_version.h.in Normal file
View File

@ -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 : GEOM_version.h
// Author : Vadim SANDLER
// Module : SALOME
#if !defined(__GEOM_VERSION_H__)
#define __GEOM_VERSION_H__
/*
GEOM_VERSION is (major << 16) + (minor << 8) + patch.
*/
#define GEOM_VERSION_STR "@VERSION@"
#define GEOM_VERSION @XVERSION@
#endif // __GEOM_VERSION_H__

5
INSTALL
View File

@ -1,4 +1 @@
This is the version 3.2.0b1 of GEOM
Compatible with :
- KERNEL 3.2.0b1
- GUI 3.2.0b1
SALOME2 : GEOM module

14
Makefile.in
View File

@ -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@
@ -200,11 +200,12 @@ undo.png
BIN_SCRIPT= \
VERSION
include_list = include/salome/SALOMEconfig.h \
include/salome/GEOM_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)
@ -226,6 +227,9 @@ include/salome/sstream: salome_adm/unix/sstream
-$(RM) $@
$(LN_S) ../../$< $@
include/salome/GEOM_version.h: GEOM_version.h
cp $< $@
depend: depend_idl
depend_idl:

1
bin/VERSION
View File

@ -1 +0,0 @@
THIS IS SALOME - GEOM VERSION: 3.2.0b1

1
bin/VERSION.in Executable file
View File

@ -0,0 +1 @@
THIS IS SALOME - GEOM VERSION: @VERSION@

4
configure.in.base
View File

@ -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)
dnl
dnl Initialize source and build root directories

2
doc/salome/tui/GEOM/doxyfile → doc/salome/tui/GEOM/doxyfile.in
View File

@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = "SALOME - GEOM - v.version"
PROJECT_NAME = "SALOME - GEOM - v.@VERSION@"
PROJECT_NUMBER =
OUTPUT_DIRECTORY = ../
CREATE_SUBDIRS = NO

2
doc/salome/tui/GEOM/doxyfile_py → doc/salome/tui/GEOM/doxyfile_py.in
View File

@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = "SALOME - GEOM - v.version"
PROJECT_NAME = "SALOME - GEOM - v.@VERSION@"
PROJECT_NUMBER =
OUTPUT_DIRECTORY = ../
CREATE_SUBDIRS = NO

2
doc/salome/tui/GEOM/sources/static/tree.js → doc/salome/tui/GEOM/sources/static/tree.js.in
View File

@ -1,4 +1,4 @@
foldersTree = gFld("<b>SALOME v.3.2.0b1 </b>", "", "")
foldersTree = gFld("<b>SALOME v.@VERSION@ </b>", "", "")
insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

4
doc/salome/tui/Makefile.in
View File

@ -24,11 +24,11 @@ PYTHON_SCRIPTS = \
docs:
cp -fr $(srcdir)/GEOM ./INPUT
cp -fr ./GEOM/doxyfile ./GEOM/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; \

4
resources/GEOMCatalog.xml → resources/GEOMCatalog.xml.in
View File

@ -16,7 +16,7 @@
<component-username>Geometry</component-username>
<component-type>Geom</component-type>
<component-author>NRI</component-author>
<component-version>3.2.0b1</component-version>
<component-version>@VERSION@</component-version>
<component-comment>Geometry component</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleGeom.png</component-icone>
@ -527,7 +527,7 @@
<component-username>GEOM_Superv</component-username>
<component-type>OTHER</component-type>
<component-author>mkr</component-author>
<component-version>3.2.0b1</component-version>
<component-version>@VERSION@</component-version>
<component-comment>Supervision wrapper for Geometry component</component-comment>
<component-multistudy>1</component-multistudy>
<component-impltype>1</component-impltype>