You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by yd...@apache.org on 2012/06/19 15:06:51 UTC
svn commit: r1351699 - in /incubator/ooo/trunk/main/jvmfwk:
distributions/OpenOfficeorg/javavendors_os2.xml
plugins/sunmajor/pluginlib/sunjre.cxx
plugins/sunmajor/pluginlib/sunversion.cxx
plugins/sunmajor/pluginlib/sunversion.hxx
Author: ydario
Date: Tue Jun 19 13:06:50 2012
New Revision: 1351699
URL: http://svn.apache.org/viewvc?rev=1351699&view=rev
Log:
i118923 - OS/2 port: more work on Java support, correctly identify new OpenJDK 1.6 client library.
Modified:
incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
Modified: incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml (original)
+++ incubator/ooo/trunk/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml Tue Jun 19 13:06:50 2012
@@ -22,20 +22,24 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <updated>2004-01-30</updated>
-
- <vendorInfos>
+
+ <updated>2011-01-07</updated>
+
+ <vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
+ </vendor>
<vendor name="Sun Microsystems Inc.">
- <minVersion>1.4.2</minVersion>
+ <minVersion>1.5.0</minVersion>
</vendor>
<vendor name="IBM Corporation">
- <minVersion>1.4.2</minVersion>
+ <minVersion>1.5.0</minVersion>
</vendor>
</vendorInfos>
<plugins>
- <library vendor="Sun Microsystems Inc.">sunjavap.dll</library>
- <library vendor="IBM Corporation">sunjavap.dll</library>
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
</plugins>
</javaSelection>
Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Tue Jun 19 13:06:50 2012
@@ -67,6 +67,7 @@ char const* const* SunInfo::getRuntimePa
"/bin/jrockit/jvm.dll"
#elif defined(OS2)
"/bin/classic/jvm.dll",
+ "/bin/client/jvm.dll",
// TODO add jrockit here
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Tue Jun 19 13:06:50 2012
@@ -215,6 +215,10 @@ SunVersion::PreRelease SunVersion::getPr
{
if (szRelease == NULL)
return Rel_NONE;
+#ifdef OS2
+ // all prerelases codes are threated the same way (-ga1, -ga2, ...)
+ return Rel_OS2;
+#endif
if( ! strcmp(szRelease,"ea"))
return Rel_EA;
else if( ! strcmp(szRelease,"ea1"))
Modified: incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx?rev=1351699&r1=1351698&r2=1351699&view=diff
==============================================================================
--- incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx (original)
+++ incubator/ooo/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Tue Jun 19 13:06:50 2012
@@ -76,6 +76,10 @@ protected:
,
Rel_FreeBSD
#endif
+#if defined(OS2)
+ ,
+ Rel_OS2
+#endif
};
//contains major,minor,micro,update