[armedbear-cvs] r14216 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Wed Oct 24 22:31:21 2012
New Revision: 14216

Log:
Choose (hopefully) more informative return values for LISP-IMPLEMENTATION-VERSION.

The use of "-" as a separator for fields in imitation of GNU configure
would probably be better replaced with returning proper lists.

Modified:
   trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java

Modified: trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java	Wed Oct 24 11:49:47 2012	(r14215)
+++ trunk/abcl/src/org/armedbear/lisp/lisp_implementation_version.java	Wed Oct 24 22:31:21 2012	(r14216)
@@ -48,14 +48,20 @@
     @Override
     public LispObject execute()
     {
-        String vendor = System.getProperty("java.vendor");
-        vendor = vendor.replace(" ", "_");
         String jdkVersion = MessageFormat.format("{0}-{1}-{2})",
-                                          vendor,
-                                          System.getProperty("os.arch"),
-                                          System.getProperty("java.runtime.version"));
+                                                 System.getProperty("java.vm.name"),
+                                                 System.getProperty("java.vm.vendor"),
+                                                 System.getProperty("java.runtime.version"))
+            .replace(" ", "_");
+        String osVersion  = MessageFormat.format("{0}-{1}-{2})",
+                                                 System.getProperty("os.arch"),
+                                                 System.getProperty("os.name"),
+                                                 System.getProperty("os.version"))
+            .replace(" ", "_");
+
         return Primitives.VALUES.execute(new SimpleString(Version.getVersion()),
-                                         new SimpleString(jdkVersion));
+                                         new SimpleString(jdkVersion),
+                                         new SimpleString(osVersion));
     }
 
     private static final lisp_implementation_version LISP_IMPLEMENTATION_VERSION =