fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 23:33:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

travis-ci proper git version

Browse Source
This commit is contained in:
Daniel Agar
2016-05-13 22:10:35 +02:00
committed by Lorenz Meier
parent e064cb645e
commit a4c7fe50a7
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1
View File
@@ -44,6 +44,7 @@ addons:
- zlib1g-dev - zlib1g-dev
before_install: before_install:
- cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --all --tags
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
pushd . pushd .
&& cd ~ && mkdir gcc && cd gcc && cd ~ && mkdir gcc && cd gcc
cmake/common/px4_base.cmake
+7 -7
View File
@@ -776,21 +776,21 @@ function(px4_create_git_hash_header)
REQUIRED HEADER REQUIRED HEADER
ARGN ${ARGN}) ARGN ${ARGN})
execute_process( execute_process(
COMMAND git describe --tags COMMAND git describe --always --tags
OUTPUT_VARIABLE git_tag OUTPUT_VARIABLE git_tag
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )
#message(STATUS "GIT_TAG = ${git_tag}") message(STATUS "GIT_TAG = ${git_tag}")
execute_process( execute_process(
COMMAND git rev-parse HEAD COMMAND git rev-parse --verify HEAD
OUTPUT_VARIABLE git_desc OUTPUT_VARIABLE git_version
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )
#message(STATUS "GIT_DESC = ${git_desc}") #message(STATUS "GIT_VERSION = ${git_version}")
set(git_desc_short) set(git_version_short)
string(SUBSTRING ${git_desc} 1 16 git_desc_short) string(SUBSTRING ${git_version} 1 16 git_version_short)
configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/build_git_version.h.in ${HEADER} @ONLY) configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/build_git_version.h.in ${HEADER} @ONLY)
endfunction() endfunction()
cmake/templates/build_git_version.h.in
+2 -2
View File
@@ -1,5 +1,5 @@
/* Auto Magically Generated file */ /* Auto Magically Generated file */
/* Do not edit! */ /* Do not edit! */
#define PX4_GIT_VERSION_STR "@git_desc@" #define PX4_GIT_VERSION_STR "@git_version@"
#define PX4_GIT_VERSION_BINARY 0x@git_desc_short@ #define PX4_GIT_VERSION_BINARY 0x@git_version_short@
#define PX4_GIT_TAG_STR "@git_tag@" #define PX4_GIT_TAG_STR "@git_tag@"