Add functions to know that SALOME module version is development one

diff --git a/HOMARD_version.h.in b/HOMARD_version.h.in
index 3fd343b46594ac4f4384efa4b9d16045099e70d3..a9e6d686410c0f22b2dc8bc47fcdd2fcedf6b45c 100644 (file)
--- 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 18cabbdc330ebcecd3249779d1589b31af4a49d8..442154d630232a440baac66dcf47a58884601f98 100644 (file)
--- 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 (file)
index 0000000..7f23a4a
--- /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 (executable)
index db96e4c..0000000
--- 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 (file)
index 0000000..9cdb476
--- /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 076a2ef080ebba41748768e27cbe53ae3c30b219..9a2d01bf2b24bcff6204f7e8678796689e62268d 100644 (file)
--- 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 \