Commit 7fafa359 authored by Julien Malik's avatar Julien Malik
Browse files

BUG: tgz source package do not have Mercurial infos

parent 22fe6dbe
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
SET(Mercurial_FOUND FALSE) SET(Mercurial_FOUND FALSE)
SET(Mercurial_HG_FOUND FALSE) SET(Mercurial_HG_FOUND FALSE)
SET(Mercurial_HG_PROJECT FALSE)
FIND_PROGRAM(Mercurial_HG_EXECUTABLE hg FIND_PROGRAM(Mercurial_HG_EXECUTABLE hg
DOC "mercurial command line client") DOC "mercurial command line client")
...@@ -43,14 +44,15 @@ IF(Mercurial_HG_EXECUTABLE) ...@@ -43,14 +44,15 @@ IF(Mercurial_HG_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
IF(NOT ${Mercurial_hg_identify_result} EQUAL 0) IF(NOT ${Mercurial_hg_identify_result} EQUAL 0)
MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} identify ${dir}\" failed with output:\n${Mercurial_hg_identify_error}") #MESSAGE(WARNING "Command \"${Mercurial_HG_EXECUTABLE} identify ${dir}\" failed with output:\n${Mercurial_hg_identify_error}")
SET(Mercurial_HG_PROJECT FALSE)
ELSE(NOT ${Mercurial_hg_identify_result} EQUAL 0) ELSE(NOT ${Mercurial_hg_identify_result} EQUAL 0)
STRING(REGEX REPLACE "^(.*\n)?Mercurial Distributed SCM [(]version ([.0-9]+).*" STRING(REGEX REPLACE "^(.*\n)?Mercurial Distributed SCM [(]version ([.0-9]+).*"
"\\2" Mercurial_VERSION_HG "${Mercurial_VERSION_HG}") "\\2" Mercurial_VERSION_HG "${Mercurial_VERSION_HG}")
STRING(REGEX REPLACE "^(.*\n)?([0-9a-f]+).*" STRING(REGEX REPLACE "^(.*\n)?([0-9a-f]+).*"
"\\2" ${prefix}_WC_REVISION "${${prefix}_WC_IDENTIFY}") "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_IDENTIFY}")
SET(Mercurial_HG_PROJECT TRUE)
ENDIF(NOT ${Mercurial_hg_identify_result} EQUAL 0) ENDIF(NOT ${Mercurial_hg_identify_result} EQUAL 0)
# restore the previous LC_ALL # restore the previous LC_ALL
......
...@@ -73,6 +73,7 @@ SET(OTB_VERSION_PATCH "0") ...@@ -73,6 +73,7 @@ SET(OTB_VERSION_PATCH "0")
FIND_PACKAGE(Mercurial) FIND_PACKAGE(Mercurial)
IF(Mercurial_FOUND) IF(Mercurial_FOUND)
Mercurial_WC_IDENTIFY(${PROJECT_SOURCE_DIR} OTB) Mercurial_WC_IDENTIFY(${PROJECT_SOURCE_DIR} OTB)
IF(Mercurial_HG_PROJECT)
MESSAGE(STATUS "Mercurial version is ${Mercurial_VERSION_HG}") MESSAGE(STATUS "Mercurial version is ${Mercurial_VERSION_HG}")
MESSAGE(STATUS "Repository revision is ${OTB_WC_REVISION}") MESSAGE(STATUS "Repository revision is ${OTB_WC_REVISION}")
SET(OTB_WC_REVISION ${OTB_WC_REVISION} CACHE STRING "Repository version" FORCE) SET(OTB_WC_REVISION ${OTB_WC_REVISION} CACHE STRING "Repository version" FORCE)
...@@ -86,6 +87,7 @@ IF(Mercurial_FOUND) ...@@ -86,6 +87,7 @@ IF(Mercurial_FOUND)
STRING(REGEX REPLACE "\n" ";" OTB_WC_STATUS "${OTB_WC_STATUS}") STRING(REGEX REPLACE "\n" ";" OTB_WC_STATUS "${OTB_WC_STATUS}")
SET(OTB_WC_STATUS ${OTB_WC_STATUS} CACHE STRING "Repository status" FORCE) SET(OTB_WC_STATUS ${OTB_WC_STATUS} CACHE STRING "Repository status" FORCE)
MARK_AS_ADVANCED(OTB_WC_STATUS) MARK_AS_ADVANCED(OTB_WC_STATUS)
ENDIF(Mercurial_HG_PROJECT)
ENDIF(Mercurial_FOUND) ENDIF(Mercurial_FOUND)
# Version string should not include patch level. The major.minor is # Version string should not include patch level. The major.minor is
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment