From 7bc2de39b5e31a6985afbe559d4ea74628da517b Mon Sep 17 00:00:00 2001 From: David Sansome Date: Fri, 2 Dec 2011 14:56:26 +0000 Subject: [PATCH] Prepend a big number to the mac version strings because we have to be bigger than the svn revision numbers that were there before --- cmake/Version.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 43d8caa8d..b2ad9fb50 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -87,9 +87,11 @@ set(INCLUDE_GIT_REVISION OFF) # Without git: $major.$minor.$patch[$prerelease] # # Mac info.plist: CFBundleVersion -# Prerelease: $major.$minor.$patch.0 -# Without git: $major.$minor.$patch.1 -# With git: $tagname.2.$commitcount +# Prerelease: 4096.$major.$minor.$patch.0 +# Without git: 4096.$major.$minor.$patch.1 +# With git: 4096.$tagname.2.$commitcount +# The 4096. prefix is because the previous versioning scheme used svn revision +# numbers, which got up to 3000+. set(majorminorpatch "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}.${CLEMENTINE_VERSION_PATCH}") @@ -99,7 +101,7 @@ set(CLEMENTINE_VERSION_DEB "${majorminorpatch}") set(CLEMENTINE_VERSION_RPM_V "${majorminorpatch}") set(CLEMENTINE_VERSION_RPM_R "1") set(CLEMENTINE_VERSION_SPARKLE "${majorminorpatch}") -set(CLEMENTINE_VERSION_PLIST "${majorminorpatch}") +set(CLEMENTINE_VERSION_PLIST "4096.${majorminorpatch}") if(${CLEMENTINE_VERSION_PATCH} EQUAL "0") set(CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}") @@ -151,7 +153,7 @@ if(INCLUDE_GIT_REVISION AND HAS_GET_REVISION) set(CLEMENTINE_VERSION_RPM_V "${GIT_TAGNAME}") set(CLEMENTINE_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}") set(CLEMENTINE_VERSION_SPARKLE "${GIT_REV}") - set(CLEMENTINE_VERSION_PLIST "${GIT_TAGNAME}.2.${GIT_COMMITCOUNT}") + set(CLEMENTINE_VERSION_PLIST "4096.${GIT_TAGNAME}.2.${GIT_COMMITCOUNT}") endif(INCLUDE_GIT_REVISION AND HAS_GET_REVISION) if(0)