Changeset 1896

Timestamp:

03/30/08 16:05:35 (9 months ago)

Author:

peter

Message:

source/punch_fits.cpp:
source/assert_results.cpp:
source/Makefile:
source/version.h:
source/parse_commands.cpp:
source/parse_print.cpp:
source/prt_comment.cpp:

Implement the new version numbering system for the C08 release.

Location:

trunk/source

Files:

• assert_results.cpp (modified) (2 diffs)
• Makefile (modified) (1 diff)
• parse_commands.cpp (modified) (1 diff)
• parse_print.cpp (modified) (1 diff)
• prt_comment.cpp (modified) (1 diff)
• punch_fits.cpp (modified) (3 diffs)
• version.h (modified) (6 diffs)

trunk/source/assert_results.cpp

@@ -2214 +2214 @@
         if( called.lgTalk && nAsserts>0 )
         { 
-                char chVer[10];
                 time_t now;
-                cdVersion(chVer );
 
                 /* First disambiguate any line identifications */
@@ -2281 +2279 @@
 
                 /* write start of title and version number of code */
-                fprintf( ioASSERT, "=============Results of asserts: C%s ",chVer );
+                fprintf( ioASSERT, "=============Results of asserts: Cloudy %s ", version::Inst().chVersion );
 
                 /* usually print date and time info - do not if "no times" command entered, 

trunk/source/Makefile

@@ -85 +85 @@
 endif
 
+SVNVER = ${shell which svnversion}
+ifneq ($(SVNVER),)
+  REVISION = ${shell $(SVNVER) $(SRCDIR)}
+else
+  REVISION = exported
+endif
+CXXFLAGS += -DSVN_REVISION=\"$(REVISION)\"
+
 cloudy.exe : ${preobjects} maincl.o libcloudy.a
         ${CXX} ${LDFLAGS} -o cloudy.exe maincl.o -L. -lcloudy ${LDLIBS}

trunk/source/parse_commands.cpp

@@ -120 +120 @@
         {
                 fprintf( ioQQQ, 
-                        "\n                             This is %s (beta %ld) of Cloudy, and is intended for testing only.\n\n", 
-                        version::Inst().chVersion, version::Inst().nBetaVer );
+                         "\n                               This is a beta release of Cloudy, and is intended for testing only.\n\n" );
         }
 

trunk/source/parse_print.cpp

@@ -95 +95 @@
         {
                 /* print compiler and code version information */
-                fprintf( ioQQQ, "\nThis is Cloudy, version %s\n%s\n\n" , 
+                fprintf( ioQQQ, "\nThis is Cloudy %s\n%s\n\n" , 
                         version::Inst().chVersion,
                         version::Inst().chInfo );

trunk/source/prt_comment.cpp

@@ -163 +163 @@
         {
                 sprintf( chLine, 
-                        "  !This is beta test version%4ld and is intended for testing only.", 
+                        "  !This is beta test version %ld and is intended for testing only.", 
                   version::Inst().nBetaVer );
                 bangin(chLine);

trunk/source/punch_fits.cpp

@@ -725 +725 @@
 STATIC void writeCloudyDetails( void )
 {
-        char chVer[10];
         char timeString[30]="";
         char tempString[70];
@@ -731 +730 @@
         long i, j, k;
 
-        cdVersion( chVer );
-
         /* usually print date and time info - do not if "no times" command entered, 
          * which set this flag false */
@@ -752 +749 @@
         }
 
-        strcpy( tempString, "Generated by Cloudy version " );
-        strcat( tempString, chVer );
+        strcpy( tempString, "Generated by Cloudy " );
+        strcat( tempString, version::Inst().chVersion );
         bytesAdded += addComment( tempString );
         bytesAdded += addComment( version::Inst().chInfo );

trunk/source/version.h

@@ -8 +8 @@
 #include "date.h"
 
+static const int CLD_MAJOR = 8;
+static const int CLD_MINOR = 1;
+static const int CLD_PATCH = 0;
+
 #if 0
-static const int CLD_MAJOR = 8;
-static const int CLD_MINOR = 0;
-
 #ifdef SVN_REVISION
 static const char* svn_revision = SVN_REVISION;
@@ -31 +32 @@
         version()
         {
-                /* set date and version - this code will need to be modified in the year 2100 */
-                if( YEAR >= 200 )
-                {
-                        fprintf(ioQQQ,"must update formation of chDate in cdInit \n");
-                        TotalInsanity();
-                }
-                
                 static const char chMonth[12][4] =
                         { "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... 
+                //
+                // /trunk -- this will be labeled as "exprimental"
+                // /tags/stable -- ditto
+                // /branches/* -- ditto, note that "*" can be anything except c??_branch
+
+                vector<string> Part;
+                Split( Url, "/", Part, SPM_RELAX );
+                if( Part.size() >= 3 )
+                {
+                        // 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")
+                        string Branch = Part[Part.size()-3];
+
+                        bool lgReleaseTag = ( Url.find("/tags/release/") != string::npos );
+                        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"
+                        bool lgReleaseBranch = ( Url.find("/branches/") != string::npos &&
+                                                 Branch.size() == 10 && Branch[0] == 'c' &&
+                                                 Branch.find("_branch") != string::npos );
+
+                        lgRelease = ( lgReleaseTag || lgPatchTag );
+
+                        // determine if this is a beta version
+                        string::size_type ptr;
+                        if( lgDevelopTag && ( ptr = Branch.find( "_rc" ) ) != string::npos )
+                                // this expects a branch name like "c08.01_rc1"
+                                sscanf( Branch.substr( ptr+3 ).c_str(), "%ld", &nBetaVer );
+                        else
+                                nBetaVer = 0;
+
+                        int nPatchLevel;
+                        if( lgPatchTag )
+                                // this expects a branch name like "c08.01.02"
+                                sscanf( Branch.substr( Branch.size()-2 ).c_str(), "%d", &nPatchLevel );
+                        else
+                                nPatchLevel = 0;        
+
+                        if( lgReleaseTag )
+                                // this expects a branch name like "c08.01"
+                                strncpy( chVersion, Branch.substr(1).c_str(), INPUT_LINE_LENGTH );
+                        else if( lgPatchTag )
+                                // this expects a branch name like "c08.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"
+                                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 );
+                        else
+                                // the branch name can be anything except "c??_branch"
+                                sprintf( chVersion, "(experimental, %s, ver. %s)", Branch.c_str(), svn_revision );
+                }
+                else
+                {
+                        // create a default version string in case HeadURL was not expanded
+
+                        /* is this a release version? */
+                        lgRelease = false;
+
+                        /* is this a beta version?  0 for no */
+                        nBetaVer = 0;
+
+                        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 */
                 nBetaVer = 0;
-                
-                /* is this a release version? */
-                lgRelease = false;
-                
-                sprintf( chDate, "%2.2i%3.3s%2.2i", 
-                         YEAR-100,
-                         chMonth[MONTH],
-                         DAY );
 
-                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 );
+                }
+#endif
+
+                sprintf( chDate, "%2.2i%3.3s%2.2i", YEAR%100, chMonth[MONTH], DAY );
+
                 char mode[6];
                 if( sizeof(long) == 4 )
@@ -64 +147 @@
                 else
                         strncpy( mode, "?????", 6 );
-                
+
                 /* now generate info on how we were compiled, including compiler version */
-                sprintf(chInfo , 
-                        "cdInit compiled on %s in OS %s using the %s %i compiler in %s mode." ,
-                        __DATE__  ,__OS , __COMP , __COMP_VER, mode);
+                sprintf( chInfo,
+                         "cdInit compiled on %s in OS %s using the %s %i compiler in %s mode.",
+                         __DATE__, __OS, __COMP, __COMP_VER, mode );
 
                 chCitation = CITATION;
@@ -75 +158 @@
         }
 public:
-        /** date of this version of the code as a string, set in cdinit.c,
-         * where space is allocated */
+        /** date of this version of the code as a string */
         char chDate[INPUT_LINE_LENGTH];
 
-        /** version number of this version of the code, as a string, set in cdinit.c 
-         * where space is allocated */
+        /** version string of this version of the code */
         char chVersion[INPUT_LINE_LENGTH];
 
@@ -86 +167 @@
         long int nBetaVer;
 
-        /* is this a release version?  if so do not print some internal comments */
+        /** is this a release version?  if so do not print some internal comments */
         bool lgRelease;
 
@@ -103 +184 @@
 };
 
-
 #endif /* _VERSION_H_ */