Changeset 680:257e91516e09 in lemon-main

Timestamp:

05/29/09 18:46:48 (16 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Children:

681:532697c9fa53, 684:7b1a6e963018, 688:1f08e846df29, 716:f47b6c94577e, 727:cab85bd7859b

Phase:

public

Message:

Set the version to 'hg-tip' if everything fails

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (1 diff)

CMakeLists.txt

@@ -16 +16 @@
     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()

configure.ac

@@ -3 +3 @@
 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])