[Cmake-commits] [cmake-commits] king committed cmCursesLongMessageForm.cxx 1.16 1.17 cmCursesMainForm.cxx 1.74 1.75

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 5 15:17:09 EST 2009


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

Modified Files:
	cmCursesLongMessageForm.cxx cmCursesMainForm.cxx 
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: cmCursesLongMessageForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesLongMessageForm.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** cmCursesLongMessageForm.cxx	29 Nov 2006 22:25:46 -0000	1.16
--- cmCursesLongMessageForm.cxx	5 Mar 2009 20:17:06 -0000	1.17
***************
*** 81,86 ****
    char version[cmCursesMainForm::MAX_WIDTH];
    char vertmp[128];
!   sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
!           cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion().c_str());
    int sideSpace = (width-strlen(vertmp));
    for(int i=0; i<sideSpace; i++) { version[i] = ' '; }
--- 81,85 ----
    char version[cmCursesMainForm::MAX_WIDTH];
    char vertmp[128];
!   sprintf(vertmp,"CMake Version %s", cmVersion::GetCMakeVersion());
    int sideSpace = (width-strlen(vertmp));
    for(int i=0; i<sideSpace; i++) { version[i] = ' '; }

Index: cmCursesMainForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesMainForm.cxx,v
retrieving revision 1.74
retrieving revision 1.75
diff -C 2 -d -r1.74 -r1.75
*** cmCursesMainForm.cxx	9 Oct 2008 16:49:49 -0000	1.74
--- cmCursesMainForm.cxx	5 Mar 2009 20:17:06 -0000	1.75
***************
*** 593,598 ****
    char version[cmCursesMainForm::MAX_WIDTH];
    char vertmp[128];
!   sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
!           cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion().c_str());
    int sideSpace = (width-strlen(vertmp));
    for(i=0; i<sideSpace; i++) { version[i] = ' '; }
--- 593,597 ----
    char version[cmCursesMainForm::MAX_WIDTH];
    char vertmp[128];
!   sprintf(vertmp,"CMake Version %s", cmVersion::GetCMakeVersion());
    int sideSpace = (width-strlen(vertmp));
    for(i=0; i<sideSpace; i++) { version[i] = ' '; }



More information about the Cmake-commits mailing list