Changeset 2290

Timestamp:

2008-07-30T15:56:21Z (15 years ago)

Author:

peter

Message:

Merge r2289 from mainline - update naming scheme for patch tags.

File:

• branches/c08_branch/source/version.h (modified) (2 diffs)

branches/c08_branch/source/version.h

@@ -62 +62 @@
                 // /tags/release/c08.01 -- first bug-fix rollup, etc... 
                 //
-                // /tags/patch_versions/c08.00.00 -- identical to /tags/release/c08.00
-                // /tags/patch_versions/c08.00.01 -- first patch update, etc... 
+                // /tags/patch_versions/c08.00_pl00 -- identical to /tags/release/c08.00
+                // /tags/patch_versions/c08.00_pl01 -- first patch update, etc... 
 
                 vector<string> Part;
@@ -114 +114 @@
                         if( lgPatchTag )
                         {
-                                // this expects a branch name like "c08.01.02"
-                                sscanf( Branch.substr(7,2).c_str(), "%d", &nPatchLevel );
+                                // this expects a branch name like "c08.01_pl02"
+                                sscanf( Branch.substr(9,2).c_str(), "%d", &nPatchLevel );
                                 if( nPatchLevel != CLD_PATCH )
                                         fprintf( ioQQQ, "PROBLEM - CLD_PATCH mismatch, please check version.h\n" );
-                                // c08.00.00 is identical to release c08.00, so pass it off as the latter...
+                                // c08.00_pl00 is identical to release c08.00, so pass it off as the latter...
                                 if( nPatchLevel == 0 )
                                         lgReleaseTag = true;