Changeset 1891 for trunk/source/version.h

Timestamp:

03/27/08 12:40:50 (8 months ago)

Author:

peter

Message:

source/service.cpp
source/punch_fits.cpp
source/init_coreload.cpp
source/grains_mie.cpp
source/assert_results.cpp
source/parse_punch.cpp
source/optimize_phymir.cpp
source/version.h
source/parse_commands.cpp
source/prt_final.cpp
source/grid_do.cpp
source/parse_print.cpp
source/cddrive.cpp
source/prt_comment.cpp
tsuite/programs/mpi/mpi.cpp

• Bug-fix for PR59 - cdVersion, cdDate could cause segfault.
  
• Start preparing for the change of the release numbering scheme for the next release.
  

Files:

• trunk/source/version.h (modified) (2 diffs, 1 prop)

trunk/source/version.h

@@ -6 +6 @@
 
 /** version.h */
+#include "date.h"
 
-#define CITATION        "Ferland, G. J., Korista, K. T., Verner, D. A., Ferguson, J. W., Kingdon, J. B., & Verner, E. M. 1998, PASP, 110, 761" 
-#define CITATION_LATEX  "\\bibitem[Ferland et al.(1998)]{1998PASP..110..761F} Ferland, G.~J., Korista, K.~T., Verner, D.~A., Ferguson, J.~W., Kingdon, J.~B., \\& Verner, E.~M.\\ 1998, \\pasp, 110, 761" 
-#define CITATION_SHORT  "Ferland et al. (1998)" 
+#if 0
+static const int CLD_MAJOR = 8;
+static const int CLD_MINOR = 0;
 
-EXTERN struct t_version {
+#ifdef SVN_REVISION
+static const char* svn_revision = SVN_REVISION;
+#else
+static const char* svn_revision = "unknown";
+#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";
+static const char* CITATION_LATEX = "\\bibitem[Ferland et al.(1998)]{1998PASP..110..761F} Ferland, G.~J., Korista, K.~T., Verner, D.~A., Ferguson, J.~W., Kingdon, J.~B., \\& Verner, E.~M.\\ 1998, \\pasp, 110, 761";
+static const char* CITATION_SHORT = "Ferland et al. (1998)";            
+
+class version : public Singleton<version> 
+{
+        friend class Singleton<version>;
+protected:
+        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" };
+                
+                /* 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 );
+                
+                char mode[6];
+                if( sizeof(long) == 4 )
+                        strncpy( mode, "ILP32", 6 );
+                else if( sizeof(long) == 8 )
+                        strncpy( mode, "LP64", 6 );
+                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);
+
+                chCitation = CITATION;
+                chCitationLatex = CITATION_LATEX;
+                chCitationShort = CITATION_SHORT;
+        }
+public:
         /** date of this version of the code as a string, set in cdinit.c,
          * where space is allocated */
-        char *chDate;
+        char chDate[INPUT_LINE_LENGTH];
 
         /** version number of this version of the code, as a string, set in cdinit.c 
          * where space is allocated */
-        char *chVersion;
+        char chVersion[INPUT_LINE_LENGTH];
 
         /** normally zero, non-zero if this is a beta test version */
@@ -39 +101 @@
         /** string to print latex bibitem with print citation command */
         const char *chCitationLatex;
-
-}       version;
+};