mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-22 18:54:02 +01:00
40581de42f
Summary: add_version_info_from_vcs was setting SVN_REVISION to the last fetched svn revision when using git svn instead of the svn revision corresponding to HEAD. This leads to conflicts with the definition of SVN_REVISION in SVNVersion.inc generated by GetSVN.cmake when HEAD is not the most recently fetched svn revision. Use 'git svn info' to determine SVN_REVISION when git svn is being used instead (as is done in GetSVN.cmake). Reviewers: beanz Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D16299 llvm-svn: 258148
81 lines
3.0 KiB
CMake
81 lines
3.0 KiB
CMake
# Adds version control information to the variable VERS. For
|
|
# determining the Version Control System used (if any) it inspects the
|
|
# existence of certain subdirectories under CMAKE_CURRENT_SOURCE_DIR.
|
|
|
|
function(add_version_info_from_vcs VERS)
|
|
string(REPLACE "svn" "" result "${${VERS}}")
|
|
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn" )
|
|
set(result "${result}svn")
|
|
# FindSubversion does not work with symlinks. See PR 8437
|
|
if( NOT IS_SYMLINK "${CMAKE_CURRENT_SOURCE_DIR}" )
|
|
find_package(Subversion)
|
|
endif()
|
|
if( Subversion_FOUND )
|
|
subversion_wc_info( ${CMAKE_CURRENT_SOURCE_DIR} Project )
|
|
if( Project_WC_REVISION )
|
|
set(SVN_REVISION ${Project_WC_REVISION} PARENT_SCOPE)
|
|
set(result "${result}-r${Project_WC_REVISION}")
|
|
endif()
|
|
if( Project_WC_URL )
|
|
set(LLVM_REPOSITORY ${Project_WC_URL} PARENT_SCOPE)
|
|
endif()
|
|
endif()
|
|
elseif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git )
|
|
set(result "${result}git")
|
|
# Try to get a ref-id
|
|
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git/svn )
|
|
find_program(git_executable NAMES git git.exe git.cmd)
|
|
if( git_executable )
|
|
set(is_git_svn_rev_exact false)
|
|
execute_process(COMMAND
|
|
${git_executable} svn info
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
TIMEOUT 5
|
|
RESULT_VARIABLE git_result
|
|
OUTPUT_VARIABLE git_output)
|
|
if( git_result EQUAL 0 )
|
|
string(REGEX MATCH "URL: ([^ \n]*)" svn_url ${git_output})
|
|
if(svn_url)
|
|
set(LLVM_REPOSITORY ${CMAKE_MATCH_1} PARENT_SCOPE)
|
|
endif()
|
|
|
|
string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
|
|
"\\2" git_svn_rev_number "${git_output}")
|
|
set(SVN_REVISION ${git_svn_rev_number} PARENT_SCOPE)
|
|
set(git_svn_rev "-svn-${git_svn_rev}")
|
|
|
|
# Determine if the HEAD points directly at a subversion revision.
|
|
execute_process(COMMAND ${git_executable} svn find-rev HEAD
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
TIMEOUT 5
|
|
RESULT_VARIABLE git_result
|
|
OUTPUT_VARIABLE git_output)
|
|
if( git_result EQUAL 0 )
|
|
string(STRIP "${git_output}" git_head_svn_rev_number)
|
|
if( git_head_svn_rev_number EQUAL git_svn_rev_number )
|
|
set(is_git_svn_rev_exact true)
|
|
endif()
|
|
endif()
|
|
else()
|
|
set(git_svn_rev "")
|
|
endif()
|
|
execute_process(COMMAND
|
|
${git_executable} rev-parse --short HEAD
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
TIMEOUT 5
|
|
RESULT_VARIABLE git_result
|
|
OUTPUT_VARIABLE git_output)
|
|
if( git_result EQUAL 0 AND NOT is_git_svn_rev_exact )
|
|
string(STRIP "${git_output}" git_ref_id)
|
|
set(GIT_COMMIT ${git_ref_id} PARENT_SCOPE)
|
|
set(result "${result}${git_svn_rev}-${git_ref_id}")
|
|
else()
|
|
set(result "${result}${git_svn_rev}")
|
|
endif()
|
|
|
|
endif()
|
|
endif()
|
|
endif()
|
|
set(${VERS} ${result} PARENT_SCOPE)
|
|
endfunction(add_version_info_from_vcs)
|