[Cmake-commits] [cmake-commits] king committed CMakeSetupFrame.cpp 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/WXDialog
In directory public:/mounts/ram/cvs-serv552/Source/WXDialog

Modified Files:
	CMakeSetupFrame.cpp 
Log Message:
ENH: Overhaul CMake version numbering

This moves the version numbers into an isolated configured header so
that not all of CMake needs to rebuild when the version changes.

Previously we had spaces, dashes and/or the word 'patch' randomly chosen
before the patch number.  Now we always report version numbers in the
traditional format "<major>.<minor>.<patch>[-rc<rc>]".

We still use odd minor numbers for development versions.  Now we also
use the CCYYMMDD date as the patch number of development versions, thus
allowing tests for exact CMake versions.


Index: CMakeSetupFrame.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/WXDialog/CMakeSetupFrame.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeSetupFrame.cpp	5 Nov 2007 19:47:20 -0000	1.3
--- CMakeSetupFrame.cpp	5 Mar 2009 20:17:07 -0000	1.4
***************
*** 701,707 ****
      
      wxString str;
!     str.Printf("CMake %d.%d - %s", cmVersion::GetMajorVersion(),
!                cmVersion::GetMinorVersion(), 
!                cmVersion::GetReleaseVersion().c_str());
      str.Printf("CMakeSetup v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
  
--- 701,705 ----
      
      wxString str;
!     str.Printf("CMake %s", cmVersion::GetCMakeVersion());
      str.Printf("CMakeSetup v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
  
***************
*** 1697,1701 ****
  
      wxString cmversion, cmsversion;
- //    cmversion.Printf("v%i.%i %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
      cmsversion.Printf("v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
  
--- 1695,1698 ----