summaryrefslogtreecommitdiffstats
path: root/Source/cmVersion.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-04-23 13:44:23 (GMT)
committerBrad King <brad.king@kitware.com>2010-04-23 13:44:23 (GMT)
commit5bfffd6f295678aedd53a53da77e0eaaafc21140 (patch)
tree6a5bbe7774d44a2380d9a160c0e3827f618975ca /Source/cmVersion.cxx
parent7049dff85a7cbfd64d61de60c27ea794d013570c (diff)
downloadCMake-5bfffd6f295678aedd53a53da77e0eaaafc21140.zip
CMake-5bfffd6f295678aedd53a53da77e0eaaafc21140.tar.gz
CMake-5bfffd6f295678aedd53a53da77e0eaaafc21140.tar.bz2
New version scheme to support branchy workflow
Prepare to switch to the workflow described by "git help workflows". In this workflow, the "master" branch is always used to integrate topics ready for release. Brand new work merges into a "next" branch instead. We need a new versioning scheme to work this way because the version on "master" must always increase. We no longer use an even/odd minor number to distinguish releases from development versions. Since we still support cvs checkout of our source tree we cannot depend on "git describe" to compute a version number based on the history graph. We can use the CCYYMMDD nightly date stamp to get a monotonically increasing version component. The new version format is "major.minor.patch.(tweak|date)". Releases use a tweak level in the half-open range [0,20000000), which is smaller than any current or future date. For tweak=0 we do not show the tweak component, leaving the format "major.minor.patch" for most releases. Development versions use date=CCYYMMDD for the tweak level. The major.minor.patch part of development versions on "master" always matches the most recent release. For example, a first-parent traversal of "master" might see v2.8.1 2.8.1.20100422 v2.8.2 | | | ----o----o----o----o----o----o----o----o---- Since the date appears in the tweak component, the next release can increment the patch level (or any more significant component) to be greater than any version leading to it. Topic branches not ready for release are published only on "next" so we know that all versions on master lead between two releases.
Diffstat (limited to 'Source/cmVersion.cxx')
-rw-r--r--Source/cmVersion.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVersion.cxx b/Source/cmVersion.cxx
index bde5f98..047d24d 100644
--- a/Source/cmVersion.cxx
+++ b/Source/cmVersion.cxx
@@ -16,8 +16,9 @@
unsigned int cmVersion::GetMajorVersion() { return CMake_VERSION_MAJOR; }
unsigned int cmVersion::GetMinorVersion() { return CMake_VERSION_MINOR; }
unsigned int cmVersion::GetPatchVersion() { return CMake_VERSION_PATCH; }
+unsigned int cmVersion::GetTweakVersion() { return CMake_VERSION_TWEAK; }
const char* cmVersion::GetCMakeVersion()
{
- return CMake_VERSION_FULL CMake_VERSION_RC_SUFFIX;
+ return CMake_VERSION;
}