X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fstlplus%2Fportability%2Fbuild.cpp;h=83679d4cb6c7173ec26e2800411a4efbeb4feda1;hp=e591a34cbd6105456b97e599c4d4d95dc278bcc5;hb=4f6e4488a55f7e3ba3f7485d78177f793c0eab9a;hpb=574af38ed616d1adfa5e6ce35f67cda1f707f89d

diff --git a/src/stlplus/portability/build.cpp b/src/stlplus/portability/build.cpp
index e591a34..83679d4 100644
--- a/src/stlplus/portability/build.cpp
+++ b/src/stlplus/portability/build.cpp
@@ -1,60 +1,88 @@
-////////////////////////////////////////////////////////////////////////////////
-
-//   Author:    Andy Rushton
-//   Copyright: (c) Southampton University 1999-2004
-//              (c) Andy Rushton           2004-2009
-//   License:   BSD License, see ../docs/license.html
-
-////////////////////////////////////////////////////////////////////////////////
-#include "build.hpp"
-#include "version.hpp"
-#include "dprintf.hpp"
-////////////////////////////////////////////////////////////////////////////////
-
-namespace stlplus
-{
-
-  ////////////////////////////////////////////////////////////////////////////////
-  // report the platform-specific details of this build
-
-  std::string build(void)
-  {
-    ////////////////////////////////////////////////////////////////////////////////
-    // work out the platform
-
-#ifdef _WIN32
-    std::string platform("Windows");
-#else
-    // at present there are no variations between different Unix platforms so
-    // they all map onto the generic Unix platform
-    std::string platform("Generic Unix");
-#endif
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // work out the compiler
-
-#if defined __GNUC__
-    std::string compiler(dformat("gcc v%s",__VERSION__));
-#elif defined _MSC_VER
-    std::string compiler(dformat("MSVC v%0.2f",((float)_MSC_VER)/100.0));
-#elif defined __BORLANDC__
-    std::string compiler(dformat("Borland v%d.%d",__BORLANDC__/256,__BORLANDC__/16%16));
-#else
-    std::string compiler("unknown compiler");
-#endif
-
-    ////////////////////////////////////////////////////////////////////////////////
-    // work out the kind of build
-    // there are two variants - debug and release
-
-#ifndef NDEBUG
-    std::string variant("debug");
-#else
-    std::string variant("release");
-#endif
-
-    return std::string("STLplus v") + version() + ", " + platform + ", " + compiler + ", " + variant;
-  }
-
-////////////////////////////////////////////////////////////////////////////////
-} // end namespace stlplus
+////////////////////////////////////////////////////////////////////////////////
+
+//   Author:    Andy Rushton
+//   Copyright: (c) Southampton University 1999-2004
+//              (c) Andy Rushton           2004 onwards
+//   License:   BSD License, see ../docs/license.html
+
+// report the platform-specific details of this build
+
+////////////////////////////////////////////////////////////////////////////////
+#include "build.hpp"
+#include "version.hpp"
+#include "dprintf.hpp"
+////////////////////////////////////////////////////////////////////////////////
+
+namespace stlplus
+{
+
+  // STLplus version in the form "STLplus v3.0" - see version.hpp for a way of getting just the version number
+  std::string stlplus_version(void)
+  {
+    return std::string("STLplus v") + version();
+  }
+
+  // platform is the target operating system in the form "Windows" or "Generic Unix"
+  std::string platform(void)
+  {
+#if defined _WIN32
+    return std::string("Windows");
+#else
+    // at present there are no variations between different Unix platforms so
+    // they all map onto the generic Unix platform
+    return std::string("Generic Unix");
+#endif
+  }
+
+  // compiler_name is the short name of the compiler, e.g. "gcc" or "MSVC"
+  std::string compiler_name(void)
+  {
+#if defined __GNUC__
+    return std::string("gcc");
+#elif defined _MSC_VER
+    return std::string("MSVC");
+#elif defined __BORLANDC__
+    return std::string("Borland");
+#else
+    return std::string("unknown compiler");
+#endif
+  }
+
+  // compiler_version is the version string of the compiler e.g. "3.4" for gcc or "15.00" for MSVC
+  std::string compiler_version(void)
+  {
+#if defined __GNUC__
+    return dformat("%d.%d.%d",__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__);
+#elif defined _MSC_VER
+    return dformat("%0.2f",((float)_MSC_VER)/100.0);
+#elif defined __BORLANDC__
+    return dformat("%d.%d%d",__BORLANDC__/256,__BORLANDC__/16%16,__BORLANDC__%16);
+#else
+    return std::string();
+#endif
+  }
+
+  // compiler is the compilation system and version above combined into a human- readable form e.g. "gcc v3.4"
+  std::string compiler(void)
+  {
+    return compiler_name() + std::string(" v") + compiler_version();
+  }
+
+  // variant is the kind of build - "debug" or "release"
+  std::string variant(void)
+  {
+#ifndef NDEBUG
+    return std::string("debug");
+#else
+    return std::string("release");
+#endif
+
+  }
+
+  std::string build(void)
+  {
+    return stlplus_version() + ", " + platform() + ", " + compiler() + ", " + variant();
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+} // end namespace stlplus