[Lemon-commits] Akos Ladanyi: Set the version to 'hg-tip' if eve...

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/257e91516e09
changeset: 727:257e91516e09
user:      Akos Ladanyi <ladanyi [at] tmit.bme.hu>
date:      Fri May 29 17:46:48 2009 +0100
description:
	Set the version to 'hg-tip' if everything fails

diffstat:

 CMakeLists.txt |   3 +++
 configure.ac   |  13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (39 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,9 @@
     ERROR_QUIET
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
+  IF(HG_REVISION STREQUAL "")
+    SET(HG_REVISION "hg-tip")
+  ENDIF()
   SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
 ENDIF()
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2,14 +2,17 @@
 
 dnl Version information.
 m4_define([lemon_version_number],
-	[m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
+          [m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
 dnl m4_define([lemon_version_number], [])
 m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
-m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
+m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))])
 m4_define([lemon_version], [ifelse(lemon_version_number(),
-			   [],
-			   [lemon_hg_path().lemon_hg_revision()],
-			   [lemon_version_number()])])
+                           [],
+                           [ifelse(lemon_hg_revision(),
+                           [],
+                           [hg-tip],
+                           [lemon_hg_path().lemon_hg_revision()])],
+                           [lemon_version_number()])])
 
 AC_PREREQ([2.59])
 AC_INIT([LEMON], [lemon_version()], [lemon-user at lemon.cs.elte.hu], [lemon])