Commit 9222e6c9 authored by Dominik Charousset's avatar Dominik Charousset

Update setup for manual files

parent 6c459534
...@@ -554,11 +554,11 @@ if(EXISTS "${MANUAL_DIR}" ...@@ -554,11 +554,11 @@ if(EXISTS "${MANUAL_DIR}"
# retrieve current SHA1 hash # retrieve current SHA1 hash
execute_process(COMMAND git log --pretty=format:%h -n 1 execute_process(COMMAND git log --pretty=format:%h -n 1
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_HASH OUTPUT_VARIABLE CAF_SHA
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if(${GIT_BRANCH} STREQUAL "master") if(${GIT_BRANCH} STREQUAL "master")
# retrieve current tag name # retrieve current tag name
execute_process(COMMAND git describe --tags --contains ${GIT_HASH} execute_process(COMMAND git describe --tags --contains ${CAF_SHA}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE GIT_TAG_RES RESULT_VARIABLE GIT_TAG_RES
OUTPUT_VARIABLE GIT_TAG OUTPUT_VARIABLE GIT_TAG
...@@ -571,7 +571,7 @@ if(EXISTS "${MANUAL_DIR}" ...@@ -571,7 +571,7 @@ if(EXISTS "${MANUAL_DIR}"
set(CAF_RELEASE "${CAF_VERSION}") set(CAF_RELEASE "${CAF_VERSION}")
endif() endif()
else() else()
set(CAF_RELEASE "${CAF_VERSION}+exp.sha.${GIT_HASH}") set(CAF_RELEASE "${CAF_VERSION}+exp.sha.${CAF_SHA}")
endif() endif()
MESSAGE(STATUS "Set manual version to ${CAF_RELEASE}") MESSAGE(STATUS "Set manual version to ${CAF_RELEASE}")
configure_file("${MANUAL_DIR}/variables.tex.in" configure_file("${MANUAL_DIR}/variables.tex.in"
...@@ -580,6 +580,12 @@ if(EXISTS "${MANUAL_DIR}" ...@@ -580,6 +580,12 @@ if(EXISTS "${MANUAL_DIR}"
configure_file("${MANUAL_DIR}/conf.py.in" configure_file("${MANUAL_DIR}/conf.py.in"
"${MANUAL_DIR}/conf.py" "${MANUAL_DIR}/conf.py"
IMMEDIATE @ONLY) IMMEDIATE @ONLY)
configure_file("${MANUAL_DIR}/index_header.rst.in"
"${MANUAL_DIR}/index_header.rst"
IMMEDIATE @ONLY)
configure_file("${MANUAL_DIR}/index_footer.rst.in"
"${MANUAL_DIR}/index_footer.rst"
IMMEDIATE @ONLY)
endif() endif()
################################################################################ ################################################################################
......
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