retrieve svn revision from git log instead of git svn info

jef · jef · commit e353bb4a6851 · 2011-01-22T12:45:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15065 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -461,7 +461,7 @@ ELSE (SVN_MARKER)
     IF(GIT)
       ADD_CUSTOM_COMMAND(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-        COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} svn info | sed -ne "s/Revision: //p"`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+        COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^  *git-svn-id:.*@\([0-9]*\).*$\/\1/p'`\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
         MAIN_DEPENDENCY ${GIT_MARKER}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ ELSE (SVN_MARKER)`
`461`	`461`	`IF(GIT)`
`462`	`462`	`ADD_CUSTOM_COMMAND(`
`463`	`463`	`OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h`
`464`		- COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} svn info \| sed -ne "s/Revision: //p"`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
	`464`	+ COMMAND echo \\\#define QGSSVNVERSION \\\"`${GIT} log -n1 --grep='git-svn-id' \| sed -ne 's/^ git-svn-id:.@\([0-9]\).$\/\1/p'`\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
`465`	`465`	`MAIN_DEPENDENCY ${GIT_MARKER}`
`466`	`466`	`WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}`
`467`	`467`	`)`