haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: rewrite version header when branch changes 

Before, only KICAD_BUILD_VERSION, which includes the hash but not the
branch, was compared when deciding whether to regenerate
kicad_build_version.h. This header also contains the branch name though,
so we should compare both to address the case of two branches pointing
at the same commit.
This commit is contained in:
Chris Pavlina 2016-09-25 10:28:50 -04:00
parent bf4b26d73f
commit 47772e7ae3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/CreateGitVersionHeader.cmake
View File

@ -28,6 +28,7 @@ macro( create_git_version_header _git_src_path )
# branch name to unknown # branch name to unknown
set( KICAD_BUILD_VERSION "no-git" ) set( KICAD_BUILD_VERSION "no-git" )
set( KICAD_BRANCH_NAME ${KICAD_REPO_NAME} ) set( KICAD_BRANCH_NAME ${KICAD_REPO_NAME} )
set( KICAD_FULL_VERSION "${KICAD_BUILD_VERSION}-${KICAD_BRANCH_NAME}")
# Include Git support to automagically create version header file. # Include Git support to automagically create version header file.
find_package( Git ) find_package( Git )
@ -107,4 +108,5 @@ macro( create_git_version_header _git_src_path )
endif() endif()
set( KICAD_BUILD_VERSION ${KICAD_BUILD_VERSION} ) set( KICAD_BUILD_VERSION ${KICAD_BUILD_VERSION} )
set( KICAD_FULL_VERSION "${KICAD_BUILD_VERSION}-${KICAD_BRANCH_NAME}")
endmacro() endmacro()

5
CMakeModules/WriteVersionHeader.cmake
View File

@ -46,8 +46,8 @@ set( _wvh_write_version_file ON )
# Compare the version argument against the version in the existing header file for a mismatch. # Compare the version argument against the version in the existing header file for a mismatch.
if( EXISTS ${OUTPUT_FILE} ) if( EXISTS ${OUTPUT_FILE} )
file( STRINGS ${OUTPUT_FILE} _current_version_str file( STRINGS ${OUTPUT_FILE} _current_version_str
REGEX "^#define[\t ]+KICAD_BUILD_VERSION[\t ]+.*" ) REGEX "^#define[\t ]+KICAD_FULL_VERSION[\t ]+.*" )
string( REGEX REPLACE "^#define KICAD_BUILD_VERSION \"([()a-zA-Z0-9 -.]+)\".*" string( REGEX REPLACE "^#define KICAD_FULL_VERSION \"([()a-zA-Z0-9 -.]+)\".*"
"\\1" _wvh_last_version "${_current_version_str}" ) "\\1" _wvh_last_version "${_current_version_str}" )
# No change, do not write version.h # No change, do not write version.h
@ -71,6 +71,7 @@ if( _wvh_write_version_file )
#define KICAD_BUILD_VERSION \"${_wvh_version_str}\" #define KICAD_BUILD_VERSION \"${_wvh_version_str}\"
#define KICAD_BRANCH_NAME \"${KICAD_BRANCH_NAME}\" #define KICAD_BRANCH_NAME \"${KICAD_BRANCH_NAME}\"
#define KICAD_FULL_VERSION \"${KICAD_FULL_VERSION}\"
#endif /* __KICAD_VERSION_H__ */ #endif /* __KICAD_VERSION_H__ */
" "