anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the git commit (if applicable) to LyX version

Browse Source 
Addition to cmake.
Patch mostly from Stephan Witt.
This commit is contained in:
Kornel Benko 2014-10-11 11:18:48 +02:00
parent 8e12587910
commit a24e076046
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@ -314,27 +314,31 @@ foreach(_c_l ${_config_lines} )
endif() endif()
endforeach(_c_l) endforeach(_c_l)
if (LYX_LOCALVERSIONING) FIND_PROGRAM(LYX_GITVERSION git)
# Find the revision number and for later use #message(STATUS "gitversion = ${LYX_GITVERSION}")
FIND_PROGRAM(LYX_GITVERSION git) set(LYX_GIT_COMMIT_HASH "none")
#message(STATUS "gitversion = ${LYX_GITVERSION}") set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
if(LYX_GITVERSION) if(LYX_GITVERSION)
EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD if (LYX_LOCALVERSIONING)
WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) # Find the revision number and for later use
if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$") EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
# We will add offset of 40000 to get appropriate value to WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
# previous svn. if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
# We use this value than also to set the package-patch-value # We will add offset of 40000 to get appropriate value to
MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)") # previous svn.
set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git") # We use this value than also to set the package-patch-value
set(ENABLE_DIST ON) MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
endif() set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
else() set(ENABLE_DIST ON)
set(LYX_REVISION_VERSION git) #TODO use date endif()
endif() endif()
else() EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} log -1 "--pretty=format:%H"
set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION}) WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE lyxgitcommit OUTPUT_STRIP_TRAILING_WHITESPACE)
if (lyxgitcommit MATCHES "^[0-9a-f]+$")
set(LYX_GIT_COMMIT_HASH ${lyxgitcommit})
endif()
endif() endif()
#message(STATUS "LYX_GIT_COMMIT_HASH = ${LYX_GIT_COMMIT_HASH}")
# Set the programs (lyx, tex2lyx, etc.) suffix # Set the programs (lyx, tex2lyx, etc.) suffix
# When building an OS X bundle, we will append # When building an OS X bundle, we will append
@ -673,7 +677,7 @@ endif()
# Compute qt4-version from ${QTVERSION} # Compute qt4-version from ${QTVERSION}
message(STATUS "") message(STATUS "")
foreach(_v PACKAGE PACKAGE_VERSION foreach(_v PACKAGE PACKAGE_VERSION LYX_GIT_COMMIT_HASH
PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER
LYX_ABS_TOP_SRCDIR LYX_ABS_TOP_SRCDIR
LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX) LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)

1
development/cmake/config.h.cmake
View File

@ -39,6 +39,7 @@
#cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}" #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"
#define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION} #define LYX_MAJOR_VERSION ${LYX_MAJOR_VERSION}
#define LYX_MINOR_VERSION ${LYX_MINOR_VERSION} #define LYX_MINOR_VERSION ${LYX_MINOR_VERSION}
#define LYX_GIT_COMMIT_HASH "${LYX_GIT_COMMIT_HASH}"
#define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}" #define PROGRAM_SUFFIX "${PROGRAM_SUFFIX}"
#define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}" #define LYX_ABS_INSTALLED_DATADIR "${LYX_ABS_INSTALLED_DATADIR}"