[llvm] r258148 - [cmake] Fix add_version_info_from_vcs git svn version bug.

[Geoff Berry via llvm-commits]

Author: gberry
Date: Tue Jan 19 11:36:02 2016
New Revision: 258148

URL: http://llvm.org/viewvc/llvm-project?rev=258148&view=rev
Log:
[cmake] Fix add_version_info_from_vcs git svn version bug.

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

Modified:
    llvm/trunk/cmake/modules/VersionFromVCS.cmake

Modified: llvm/trunk/cmake/modules/VersionFromVCS.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/VersionFromVCS.cmake?rev=258148&r1=258147&r2=258148&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/VersionFromVCS.cmake (original)
+++ llvm/trunk/cmake/modules/VersionFromVCS.cmake Tue Jan 19 11:36:02 2016
@@ -27,16 +27,20 @@ function(add_version_info_from_vcs VERS)
       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 log --limit=1 --oneline
+        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 r[0-9]+ git_svn_rev ${git_output})
-          string(LENGTH "${git_svn_rev}" rev_length)
-          math(EXPR rev_length "${rev_length}-1")
-          string(SUBSTRING "${git_svn_rev}" 1 ${rev_length} git_svn_rev_number)
+          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}")
 
@@ -69,18 +73,6 @@ function(add_version_info_from_vcs VERS)
           set(result "${result}${git_svn_rev}")
         endif()
 
-        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()
-        endif()
       endif()
     endif()
   endif()