From b27bce4028d985be911f86665ca4a51e70684e38 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 22 Mar 2012 15:30:54 +0000 Subject: [PATCH] Add functions to know that SALOME module version is development one --- HOMARD_version.h.in | 1 + Makefile.am | 4 ++-- bin/Makefile.am | 23 +++++++++++++++++++++++ bin/VERSION | 1 - bin/VERSION.in | 3 +++ configure.ac | 4 ++++ 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 bin/Makefile.am delete mode 100755 bin/VERSION create mode 100644 bin/VERSION.in diff --git a/HOMARD_version.h.in b/HOMARD_version.h.in index 3fd343b4..a9e6d686 100644 --- a/HOMARD_version.h.in +++ b/HOMARD_version.h.in @@ -33,5 +33,6 @@ #define HOMARD_VERSION_STR "@VERSION@" #define HOMARD_VERSION @XVERSION@ +#define HOMARD_DEVELOPMENT @VERSION_DEV@ #endif // __HOMARD_VERSION_H__ diff --git a/Makefile.am b/Makefile.am index 18cabbdc..442154d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,9 @@ ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files -SUBDIRS = idl adm_local resources src doc tests +SUBDIRS = idl adm_local resources src bin doc tests -DIST_SUBDIRS = idl adm_local resources src doc tests +DIST_SUBDIRS = idl adm_local resources src bin doc tests DISTCLEANFILES = a.out aclocal.m4 configure hack_libtool diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 00000000..7f23a4a2 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,23 @@ +# Copyright (C) 2011 CEA/DEN, EDF R&D +# +# 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/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +nodist_salomescript_DATA = \ + VERSION diff --git a/bin/VERSION b/bin/VERSION deleted file mode 100755 index db96e4c9..00000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME PRO - HOMARD VERSION: 0 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100644 index 00000000..9cdb4761 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1,3 @@ +[SALOME HOMARD] : @VERSION@ +[DEVELOPMENT] : @VERSION_DEV@ + diff --git a/configure.ac b/configure.ac index 076a2ef0..9a2d01bf 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,8 @@ SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'` AC_SUBST(SHORT_VERSION) XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` AC_SUBST(XVERSION) +VERSION_DEV=1 +AC_SUBST(VERSION_DEV) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) MODULE_NAME=homard @@ -400,6 +402,8 @@ AC_OUTPUT([ \ adm_local/Makefile \ adm_local/unix/Makefile \ adm_local/unix/config_files/Makefile \ + bin/Makefile \ + bin/VERSION \ doc/Makefile \ doc/conf.py \ HOMARD_version.h \ -- 2.39.2