Changeset 2138 for trunk/source/version.h

Timestamp:

06/29/08 08:53:10 (5 months ago)

Author:

peter

Message:

source/version.h:

Activate new version numbering scheme which includes the svn revision and branch name.

Files:

• trunk/source/version.h (modified) (6 diffs)

trunk/source/version.h

@@ -12 +12 @@
 static const int CLD_PATCH = 0;
 
-#if 0
 #ifdef SVN_REVISION
 static const char* svn_revision = SVN_REVISION;
 #else
-static const char* svn_revision = "unknown";
+static const char* svn_revision = "????";
 #endif
 
 static const string Url = "$HeadURL$";
-#endif
 
 static const char* CITATION = "Ferland, G. J., Korista, K. T., Verner, D. A., Ferguson, J. W., Kingdon, J. B., & Verner, E. M. 1998, PASP, 110, 761";
@@ -35 +33 @@
                         { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 
-#if 0
                 // first analyze the URL to determine where we live, the chVersion string is derived from that
                 // the code below is based on the following naming scheme:
                 //
-                // /branches/c08_branch -- release branch, all bug fixes are submitted here 
-                //
-                // /tags/develop/c08.01_rc1 -- release candidates go here 
-                //
-                // /tags/release/c08.01 -- first official release
-                // /tags/release/c08.02 -- first bug-fix rollup, etc... 
-                //
-                // /tags/patch_versions/c08.01.00 -- identical to /tags/release/c08.01
-                // /tags/patch_versions/c08.01.01 -- first patch update, etc... 
+                // /branches/c09_branch -- release branch, all bug fixes are submitted here 
+                //
+                // /tags/develop/c09.00_rc1 -- release candidates go here 
+                //
+                // /tags/release/c09.00 -- first official release
+                // /tags/release/c09.01 -- first bug-fix rollup, etc... 
+                //
+                // /tags/patch_versions/c09.00.00 -- identical to /tags/release/c09.00
+                // /tags/patch_versions/c09.00.01 -- first patch update, etc... 
                 //
                 // /trunk -- this will be labeled as "exprimental"
@@ -58 +55 @@
                 {
                         // the last two parts are "source" and "version.h $", we don't need them...
-                        // the one before is the name of the branch (e.g. "trunk", "newmole", "c08.01")
+                        // the one before is the relevant identifier (e.g. "trunk", "newmole", "c09.01")
+                        // for conciseness we will refer to it below as the "branch"
                         string Branch = Part[Part.size()-3];
 
@@ -64 +62 @@
                         bool lgPatchTag = ( Url.find("/tags/patch_versions/") != string::npos );
                         bool lgDevelopTag = ( Url.find("/tags/develop/") != string::npos );
-                        // this expects a branch name like "c08_branch"
+                        // this expects a branch name like "c09_branch"
                         bool lgReleaseBranch = ( Url.find("/branches/") != string::npos &&
                                                  Branch.size() == 10 && Branch[0] == 'c' &&
@@ -74 +72 @@
                         string::size_type ptr;
                         if( lgDevelopTag && ( ptr = Branch.find( "_rc" ) ) != string::npos )
-                                // this expects a branch name like "c08.01_rc1"
+                                // this expects a branch name like "c09.00_rc1"
                                 sscanf( Branch.substr( ptr+3 ).c_str(), "%ld", &nBetaVer );
                         else
                                 nBetaVer = 0;
 
-                        int nPatchLevel;
+                        int nMajorLevel=0, nMinorLevel=0, nPatchLevel=0;
+
+                        if( lgReleaseBranch || lgRelease || nBetaVer > 0 )
+                        {
+                                // this expects a branch name starting with "c09"
+                                sscanf( Branch.substr(1,2).c_str(), "%d", &nMajorLevel );
+                                if( nMajorLevel != CLD_MAJOR )
+                                        fprintf( ioQQQ, "PROBLEM - CLD_MAJOR mismatch, please check version.h\n" );
+                        }
+
+                        if( lgRelease || nBetaVer > 0 )
+                        {
+                                // this expects a branch name starting with "c09.01"
+                                sscanf( Branch.substr(4,2).c_str(), "%d", &nMinorLevel );
+                                if( nMinorLevel != CLD_MINOR )
+                                        fprintf( ioQQQ, "PROBLEM - CLD_MINOR mismatch, please check version.h\n" );
+                        }
+                        
                         if( lgPatchTag )
-                                // this expects a branch name like "c08.01.02"
-                                sscanf( Branch.substr( Branch.size()-2 ).c_str(), "%d", &nPatchLevel );
-                        else
-                                nPatchLevel = 0;        
+                        {
+                                // this expects a branch name like "c09.01.02"
+                                sscanf( Branch.substr(7,2).c_str(), "%d", &nPatchLevel );
+                                if( nPatchLevel != CLD_PATCH )
+                                        fprintf( ioQQQ, "PROBLEM - CLD_PATCH mismatch, please check version.h\n" );
+                                // c09.00.00 is identical to release c09.00, so pass it off as the latter...
+                                if( nPatchLevel == 0 )
+                                        lgReleaseTag = true;
+                        }
 
                         if( lgReleaseTag )
-                                // this expects a branch name like "c08.01"
-                                strncpy( chVersion, Branch.substr(1).c_str(), INPUT_LINE_LENGTH );
+                                // this expects a branch name like "c09.01"
+                                strncpy( chVersion, Branch.substr(1,5).c_str(), INPUT_LINE_LENGTH );
                         else if( lgPatchTag )
-                                // this expects a branch name like "c08.01.02"
+                                // this expects a branch name like "c09.01.02"
                                 sprintf( chVersion, "%s (patch level %d)", Branch.substr(1,5).c_str(), nPatchLevel );
                         else if( nBetaVer > 0 )
-                                // this expects a branch name like "c08.01_rc1"
+                                // this expects a branch name like "c09.00_rc1"
                                 sprintf( chVersion, "%s beta %ld (prerelease)", Branch.substr(1,5).c_str(), nBetaVer );
                         else if( lgReleaseBranch )
-                                // this expects a branch name like "c08_branch"
-                                sprintf( chVersion, "(prerelease, %s, ver. %s)", Branch.c_str(), svn_revision );
+                                // this expects a branch name like "c09_branch"
+                                sprintf( chVersion, "(prerelease, %s, r%s)", Branch.c_str(), svn_revision );
                         else
                                 // the branch name can be anything except "c??_branch"
-                                sprintf( chVersion, "(experimental, %s, ver. %s)", Branch.c_str(), svn_revision );
+                                sprintf( chVersion, "(experimental, %s, r%s)", Branch.c_str(), svn_revision );
                 }
                 else
@@ -109 +129 @@
                         lgRelease = false;
 
-                        /* is this a beta version?  0 for no */
+                        /* is this a beta version?  0 for no
+                         * if this is non-zero then lgRelease above should be false */
                         nBetaVer = 0;
 
-                        sprintf( chVersion, "%2.2i%2.2i%2.2i", YEAR%100, MONTH+1, DAY );
+                        if( lgRelease )
+                        {
+                                if( CLD_PATCH > 0 )
+                                        sprintf( chVersion, "%2.2i.%2.2i (patch level %d)",
+                                                 CLD_MAJOR, CLD_MINOR, CLD_PATCH );
+                                else
+                                        sprintf( chVersion, "%2.2i.%2.2i", CLD_MAJOR, CLD_MINOR );
+                        }
+                        else if( nBetaVer > 0 )
+                        {
+                                sprintf( chVersion, "%2.2i.%2.2i beta %ld (prerelease)",
+                                         CLD_MAJOR, CLD_MINOR, nBetaVer );
+                        }
+                        else
+                        {
+                                sprintf( chVersion, "%2.2i.%2.2i.%2.2i", YEAR%100, MONTH+1, DAY );
+                        }
                 }
-#else
-                /* is this a release version? */
-                lgRelease = false;
-
-                /* is this a beta version?  0 for no
-                 * if this is non-zero then lgRelease above should be false */
-                nBetaVer = 0;
-
-                if( lgRelease )
-                {
-                        if( CLD_PATCH > 0 )
-                                sprintf( chVersion, "%2.2i.%2.2i (patch level %d)", CLD_MAJOR, CLD_MINOR, CLD_PATCH );
-                        else
-                                sprintf( chVersion, "%2.2i.%2.2i", CLD_MAJOR, CLD_MINOR );
-                }
-                else if( nBetaVer > 0 )
-                {
-                        sprintf( chVersion, "%2.2i.%2.2i beta %ld (prerelease)", CLD_MAJOR, CLD_MINOR, nBetaVer );
-                }
-                else
-                {
-                        sprintf( chVersion, "%2.2i.%2.2i.%2.2i", YEAR%100, MONTH+1, DAY );
-                }
-#endif
 
                 sprintf( chDate, "%2.2i%3.3s%2.2i", YEAR%100, chMonth[MONTH], DAY );