[Libreoffice-commits] .: jvmfwk/plugins

[Petr Mladek]

 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 7d919761f492971122f2d9b2c6ff7276485ab69d
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Mar 31 19:00:59 2011 +0200

    jvmfwk-gij-paths.diff: more gij/libgcj paths

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index f6874a6..df9c060 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -51,7 +51,13 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
 {
     static char const * ar[] = {
         "gij",
-        "bin/gij"
+        "bin/gij",
+        "gij-4.3",
+        "bin/gij-4.3",
+        "gij-4.2",
+        "bin/gij-4.2",
+        "gij-4.1",
+        "bin/gij-4.1"
     };
     *size = sizeof (ar) / sizeof (char*);
     return ar;
@@ -69,6 +75,20 @@ char const* const* GnuInfo::getRuntimePaths(int * size)
         "/libjvm.so",
         "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/gcj-4.1.1/libjvm.so",
+        "/gcj-4.3-90/libjvm.so",
+        "/gcj-4.2-81/libjvm.so",
+        "/gcj-4.2/libjvm.so",
+        "/gcj-4.2.1/libjvm.so",
+        "/gcj-4.2.2/libjvm.so",
+        "/gcj-4.2.3/libjvm.so",
+        "/gcj-4.1-71/libjvm.so",
+        "/gcj-4_1/libjvm.so",
+        "/gcj-4.1/libjvm.so",
+        "/libgcj.so.81",
+        "/libgcj.so.80",
+        "/libgcj.so.8",
+        "/libgcj.so.71",
+        "/libgcj.so.70",
         "/libgcj.so.7",
         "/libgcj.so.6"
     };