gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Set the version to 'hg-tip' if everything fails
0 2 0
default
2 files changed with 8 insertions and 2 deletions:
↑ Collapse diff ↑
Show white space 6 line context
... ...
@@ -15,6 +15,9 @@
15 15
    ERROR_QUIET
16 16
    OUTPUT_STRIP_TRAILING_WHITESPACE
17 17
  )
18
  IF(HG_REVISION STREQUAL "")
19
    SET(HG_REVISION "hg-tip")
20
  ENDIF()
18 21
  SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
19 22
ENDIF()
20 23

	
Show white space 6 line context
... ...
@@ -5,10 +5,13 @@
5 5
	[m4_normalize(esyscmd([echo ${LEMON_VERSION}]))])
6 6
dnl m4_define([lemon_version_number], [])
7 7
m4_define([lemon_hg_path], [m4_normalize(esyscmd([./scripts/chg-len.py]))])
8
m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
8
m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i 2> /dev/null]))])
9 9
m4_define([lemon_version], [ifelse(lemon_version_number(),
10 10
			   [],
11
			   [lemon_hg_path().lemon_hg_revision()],
11
                           [ifelse(lemon_hg_revision(),
12
                           [],
13
                           [hg-tip],
14
                           [lemon_hg_path().lemon_hg_revision()])],
12 15
			   [lemon_version_number()])])
13 16

	
14 17
AC_PREREQ([2.59])
0 comments (0 inline)