[kaffe] CVS kaffe (robilad): small property fixes for jedit and jogl

[Kaffe CVS]

PatchSet 5583 
Date: 2005/02/21 04:52:32
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small property fixes for jedit and jogl

2005-02-21  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/classpath/VMSystemProperties.java:
        Set java.version to 1.4.2 for jEdit.
        Set os.arch to i386 for jogl.

Members: 
	ChangeLog:1.3627->1.3628 
	libraries/javalib/gnu/classpath/VMSystemProperties.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3627 kaffe/ChangeLog:1.3628
--- kaffe/ChangeLog:1.3627	Sun Feb 20 12:52:54 2005
+++ kaffe/ChangeLog	Mon Feb 21 04:52:32 2005
@@ -1,3 +1,9 @@
+2005-02-21  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/gnu/classpath/VMSystemProperties.java:
+	Set java.version to 1.4.2 for jEdit.
+	Set os.arch to i386 for jogl.
+
 2005-02-20  Dalibor Topic  <robilad at kaffe.org>
 
 	* config/s390/sysdepCallMethod.h: Added missing semi-colon
Index: kaffe/libraries/javalib/gnu/classpath/VMSystemProperties.java
diff -u kaffe/libraries/javalib/gnu/classpath/VMSystemProperties.java:1.2 kaffe/libraries/javalib/gnu/classpath/VMSystemProperties.java:1.3
--- kaffe/libraries/javalib/gnu/classpath/VMSystemProperties.java:1.2	Sat Jan  1 15:55:55 2005
+++ kaffe/libraries/javalib/gnu/classpath/VMSystemProperties.java	Mon Feb 21 04:52:34 2005
@@ -89,7 +89,7 @@
 
       // Set the static, os-independant properties first.
 
-      properties.setProperty("java.version", "1.4");
+      properties.setProperty("java.version", "1.4.2");
       properties.setProperty("java.vendor", "Kaffe.org project");
       properties.setProperty("java.vendor.url", "http://www.kaffe.org");
       properties.setProperty("java.vendor.url.bug", "http://www.kaffe.org");
@@ -136,7 +136,12 @@
       final String OS_NAME = getOsName();
       properties.setProperty("os.name", OS_NAME);
 
-      final String OS_ARCH = getOsArch();
+      String OS_ARCH = getOsArch();
+
+      // Unify x86 OS_ARCH for jogl
+      if (OS_ARCH.startsWith("i") && OS_ARCH.endsWith("86"))
+        OS_ARCH = "i386";
+
       properties.setProperty("os.arch", OS_ARCH);
 
       final String OS_VERSION = getOsVersion();