Kornel Benko <kor...@lyx.org> writes:
| OK. So now I have the first change for cmake ready. It works like the
svn-based version.
| For now, I add 40000 to the commit value.
And of course I didn't look at the patch.
| More sophisticated handling (like evaluate also `git log 2.0.0 -n1`) looks
like not needed.
>
| Kornel
>
| diff --git a/CMakeLists.txt b/CMakeLists.txt
| index 1f6daf3..6bd53ba 100644
| --- a/CMakeLists.txt
| +++ b/CMakeLists.txt
| @@ -251,16 +251,18 @@ foreach(_c_l ${_config_lines} )
| endforeach(_c_l)
|
| # Find the revision number and for later use
| -FIND_PROGRAM(LYX_SVNVERSION svnversion)
| -#message(STATUS "svnversion = ${LYX_SVNVERSION}")
| -if(LYX_SVNVERSION)
| - EXECUTE_PROCESS(COMMAND ${LYX_SVNVERSION} WORKING_DIRECTORY
"${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE
OUTPUT_STRIP_TRAILING_WHITESPACE)
| - # We use this value also to set the package-patch-value
| - if(LYX_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
| - set(LYX_REVISION_VERSION ${CMAKE_MATCH_1})
| +FIND_PROGRAM(LYX_GITVERSION git)
| +#message(STATUS "gitversion = ${LYX_GITVERSION}")
| +if(LYX_GITVERSION)
| + EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "describe" WORKING_DIRECTORY
"${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE
OUTPUT_STRIP_TRAILING_WHITESPACE)
| + if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
| + # We will add offset of 40000 to get appropriate value to
| + # previous svn.
| + # We use this value than also to set the package-patch-value
| + MATH(EXPR LYX_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
This looks like something specific for 2.0.x, is that right?
And if not in 2.0.x you just use the output from git describe?
| endif()
| else()
| - set(LYX_REVISION_VERSION svn) #TODO use date
| + set(LYX_REVISION_VERSION git) #TODO use date
This when running in some non VC context? (tarfile etc)?
| endif()
|
|
