Changeset 7383

Timestamp:

09/11/07 12:10:43

Author:

robert

Message:

From Mike Wittman and Robert Osfield, added support for SO_VERSION number in
runtime version info. Added checks for OpenThreads? version.

Files:

• OpenSceneGraph/trunk/applications/osgversion/osgversion.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/include/osg/Version (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osg/Version.cpp (modified) (1 diff)

OpenSceneGraph/trunk/applications/osgversion/osgversion.cpp

@@ -2 +2 @@
-#include <osg/ArgumentParser>
-#include <osg/ApplicationUsage>
+#include <OpenThreads/Version>
-
-#include <set>
@@ -650 +651 @@
-    arguments.getApplicationUsage()->addCommandLineOption("--entries","Print out number of entries into the ChangeLog file for each contributor.");
-    arguments.getApplicationUsage()->addCommandLineOption("--version-number","Print out version number only");
+    arguments.getApplicationUsage()->addCommandLineOption("--soversion-number","Print out shared object version number only");
+    arguments.getApplicationUsage()->addCommandLineOption("--openthreads-version-number","Print out version number for OpenThreads only");
+    arguments.getApplicationUsage()->addCommandLineOption("--openthreads-soversion-number","Print out shared object version number for OpenThreads only");
-    arguments.getApplicationUsage()->addCommandLineOption("-r <file> or --read <file>","Read the ChangeLog to generate an estimated contributors list.");
-
@@ -655 +659 @@
-    {
-        std::cout<<osgGetVersion()<<std::endl;
+        return 0;
+    }
+    
+    if (arguments.read("--soversion-number"))
+    {
+        std::cout<<osgGetSOVersion()<<std::endl;
+        return 0;
+    }
+    
+    if (arguments.read("--openthreads-version-number"))
+    {
+        std::cout<<OpenThreadsGetVersion()<<std::endl;
+        return 0;
+    }
+    
+    if (arguments.read("--openthreads-soversion-number"))
+    {
+        std::cout<<OpenThreadsGetSOVersion()<<std::endl;
-        return 0;
-    }

OpenSceneGraph/trunk/include/osg/Version

@@ -19 +19 @@
-extern "C" {
-
-#define OSG_VERSION_MAJOR 2
-#define OSG_VERSION_MINOR 1
-#define OSG_VERSION_PATCH 9
-
-
-
+
+
+
+
-
-/**
@@ -44 +43 @@
-extern OSG_EXPORT const char* osgGetVersion();
-
+/** The osgGetSOVersion() method returns the OpenSceneGraph soversion number. */
+extern OSG_EXPORT const char* osgGetSOVersion();
+
-/** The osgGetLibraryName() method returns the library name in human-friendly form. */
-extern OSG_EXPORT const char* osgGetLibraryName();
+
+// old defines for backwards compatibility.
+#define OSG_VERSION_MAJOR OPENSCENEGRAPH_MAJOR_VERSION
+#define OSG_VERSION_MINOR OPENSCENEGRAPH_MINOR_VERSION
+#define OSG_VERSION_PATCH OPENSCENEGRAPH_PATCH_VERSION
+
+#define OSG_VERSION_RELEASE OSG_VERSION_PATCH
+#define OSG_VERSION_REVISION 0
+
-
-}

OpenSceneGraph/trunk/src/osg/Version.cpp

@@ -38 +38 @@
-}
-
+const char* osgGetSOVersion()
+{
+    static char osg_soversion[32];
+    static int osg_soversion_init = 1;
+    if (osg_soversion_init)
+    {
+        sprintf(osg_soversion,"%d",OPENSCENEGRAPH_SOVERSION);
+        osg_soversion_init = 0;
+    }
+    
+    return osg_soversion;
+}
-
-const char* osgGetLibraryName()