[lmi-commits] [4908] Cleanly distinguish production from the antediluvian fork

[Greg Chicares]

Revision: 4908
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4908
Author:   chicares
Date:     2010-05-06 00:25:50 +0000 (Thu, 06 May 2010)
Log Message:
-----------
Cleanly distinguish production from the antediluvian fork

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/Makefile.am
    lmi/trunk/antediluvian_stubs.cpp
    lmi/trunk/authenticity.cpp
    lmi/trunk/authenticity.hpp
    lmi/trunk/main_cli.cpp
    lmi/trunk/objects.make

Added Paths:
-----------
    lmi/trunk/lmi.cpp
    lmi/trunk/lmi.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/ChangeLog 2010-05-06 00:25:50 UTC (rev 4908)
@@ -25440,3 +25440,20 @@
   main_cli.cpp
 Reduce inelegance.
 
+20100505T2345Z <address@hidden> [718]
+
+  Makefile.am
+Fix apparent defects. For example, all 'mec_*' files were missing.
+
+20100506T0025Z <address@hidden> [718]
+
+  Makefile.am
+  antediluvian_stubs.cpp
+  authenticity.cpp
+  authenticity.hpp
+  lmi.cpp [new file]
+  lmi.hpp [new file]
+  main_cli.cpp
+  objects.make
+Cleanly distinguish production from the antediluvian fork.
+

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/Makefile.am       2010-05-06 00:25:50 UTC (rev 4908)
@@ -337,6 +337,7 @@
     ihs_irc7702.cpp \
     ihs_irc7702a.cpp \
     ihs_mortal.cpp \
+    lmi.cpp \
     md5.cpp \
     mec_input.cpp \
     mec_server.cpp \
@@ -938,6 +939,7 @@
     ledger_xsl.hpp \
     ledgervalues.hpp \
     license.hpp \
+    lmi.hpp \
     loads.hpp \
     loads_impl.hpp \
     main_common.hpp \

Modified: lmi/trunk/antediluvian_stubs.cpp
===================================================================
--- lmi/trunk/antediluvian_stubs.cpp    2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/antediluvian_stubs.cpp    2010-05-06 00:25:50 UTC (rev 4908)
@@ -26,7 +26,7 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
-#include "authenticity.hpp"
+#include "lmi.hpp"          // is_antediluvian_fork()
 #include "mec_server.hpp"
 #include "product_data.hpp"
 #include "xml_serializable.tpp"
@@ -39,9 +39,9 @@
 void authenticate_system()
 {}
 
-std::string const& timestamp_of_production_release()
+bool is_antediluvian_fork()
 {
-    return empty_string;
+    return true;
 }
 
 mec_server::mec_server(mcenum_emission)

Modified: lmi/trunk/authenticity.cpp
===================================================================
--- lmi/trunk/authenticity.cpp  2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/authenticity.cpp  2010-05-06 00:25:50 UTC (rev 4908)
@@ -37,7 +37,6 @@
 #include "path_utility.hpp"       // fs::path inserter
 #include "platform_dependent.hpp" // chdir()
 #include "system_command.hpp"
-#include "version.hpp"
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -305,9 +304,3 @@
     return oss.str();
 }
 
-std::string const& timestamp_of_production_release()
-{
-    static std::string const s(LMI_VERSION);
-    return s;
-}
-

Modified: lmi/trunk/authenticity.hpp
===================================================================
--- lmi/trunk/authenticity.hpp  2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/authenticity.hpp  2010-05-06 00:25:50 UTC (rev 4908)
@@ -88,12 +88,5 @@
 
 inline char const* md5sum_file() {return "validated.md5";}
 
-/// Timestamp of production release.
-///
-/// Deliberately return an empty string for the antediluvian fork,
-/// providing a means to distinguish it from production.
-
-std::string const& LMI_SO timestamp_of_production_release();
-
 #endif // authenticity_hpp
 

Added: lmi/trunk/lmi.cpp
===================================================================
--- lmi/trunk/lmi.cpp                           (rev 0)
+++ lmi/trunk/lmi.cpp   2010-05-06 00:25:50 UTC (rev 4908)
@@ -0,0 +1,43 @@
+// Production versus the antediluvian fork.
+//
+// Copyright (C) 2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifdef __BORLANDC__
+#   include "pchfile.hpp"
+#   pragma hdrstop
+#endif
+
+#include "lmi.hpp"
+
+#include "version.hpp"
+
+bool is_antediluvian_fork()
+{
+    return false;
+}
+
+std::string const& timestamp_of_production_release()
+{
+    static std::string const s(LMI_VERSION);
+    return s;
+}
+


Property changes on: lmi/trunk/lmi.cpp
___________________________________________________________________
Added: svn:keywords
   + Id

Added: lmi/trunk/lmi.hpp
===================================================================
--- lmi/trunk/lmi.hpp                           (rev 0)
+++ lmi/trunk/lmi.hpp   2010-05-06 00:25:50 UTC (rev 4908)
@@ -0,0 +1,42 @@
+// Production versus the antediluvian fork.
+//
+// Copyright (C) 2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifndef lmi_hpp
+#define lmi_hpp
+
+#include "config.hpp"
+
+#include "so_attributes.hpp"
+
+#include <string>
+
+/// Distinguish the antediluvian fork from production.
+
+bool LMI_SO is_antediluvian_fork();
+
+/// Timestamp of production release.
+
+std::string const& LMI_SO timestamp_of_production_release();
+
+#endif // lmi_hpp
+


Property changes on: lmi/trunk/lmi.hpp
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: lmi/trunk/main_cli.cpp
===================================================================
--- lmi/trunk/main_cli.cpp      2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/main_cli.cpp      2010-05-06 00:25:50 UTC (rev 4908)
@@ -28,7 +28,6 @@
 
 #include "alert.hpp"
 #include "assert_lmi.hpp"
-#include "authenticity.hpp" // timestamp_of_production_release()
 #include "dbdict.hpp"       // print_databases()
 #include "getopt.hpp"
 #include "global_settings.hpp"
@@ -39,6 +38,7 @@
 #include "ledger_invariant.hpp"
 #include "ledger_variant.hpp"
 #include "license.hpp"
+#include "lmi.hpp"          // is_antediluvian_fork()
 #include "main_common.hpp"
 #include "mc_enum.hpp"
 #include "mc_enum_types.hpp"
@@ -126,7 +126,7 @@
 
 void self_test()
 {
-    bool const antediluvian = timestamp_of_production_release().empty();
+    bool const antediluvian = is_antediluvian_fork();
 
     illustrator z(mce_emit_nothing);
 

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2010-05-05 23:45:35 UTC (rev 4907)
+++ lmi/trunk/objects.make      2010-05-06 00:25:50 UTC (rev 4908)
@@ -278,6 +278,7 @@
   ihs_irc7702.o \
   ihs_irc7702a.o \
   ihs_mortal.o \
+  lmi.o \
   md5.o \
   mec_input.o \
   mec_server.o \