[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins

[Damjan Jovanovic (via logerrit)]

 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |4 +++-
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx   |6 --
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1eae11e288b879e4b770fe714c3229fd3bd7d8ec
Author: Damjan Jovanovic 
AuthorDate: Sat Jul 27 19:55:19 2019 +
Commit: Damjan Jovanovic 
CommitDate: Sat Jul 27 19:55:19 2019 +

Fix detection of Java versions > 1.8

Patch by: me

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 84dfedfaedd9..46456bc2be2b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
 "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA 
Systems
+"/lib/server/libjvm.so", // > 1.8
 "/bin/classic/libjvm.so", // fallback for older for IBM Java
 "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
 #endif
@@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
 "/lib/" JFW_PLUGIN_ARCH "/classic",
 "/lib/" JFW_PLUGIN_ARCH "/jrockit",
 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
-"/lib/" JFW_PLUGIN_ARCH
+"/lib/" JFW_PLUGIN_ARCH,
+"/lib" // > 1.8
 #endif
 };
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 2f636561ad07..a0ecb2508864 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
-"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
+"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
+"/lib/server/libjvm.so" // > 1.8
 #endif
 };
 *size = sizeof(ar) / sizeof (char*);
@@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 
 "/lib/" JFW_PLUGIN_ARCH "/client",
 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
-"/lib/" JFW_PLUGIN_ARCH
+"/lib/" JFW_PLUGIN_ARCH,
+"/lib" // > 1.8
 
 };
 *size = sizeof(ar) / sizeof (char*);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins

[Don Lewis]

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a76717559adcc05a2c47c2ce843b20708d0e9eb5
Author: Don Lewis 
Date:   Wed May 2 01:36:10 2018 +

Fix build on Windows with precompiled headers.

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 90c52f3ab66d..906d646a5235 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_jvmfwk.hxx"
+#include "precompiled_plugin.hxx"
 
 #include "util.hxx"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins

[Damjan Jovanovic]

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5d4ce3e29c7aab3498e0955485d8707a8f5fb456
Author: Damjan Jovanovic 
Date:   Sun Apr 15 15:00:46 2018 +

Allow the Java version suffix (eg. the 162 in 1.8.0_162) to be

3 digits long.

Patch by: me

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index a9c98ddae024..c1872f0d61f4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -144,8 +144,9 @@ bool SunVersion::init(const char *szVersion)
 if ( ! isdigit(*pCur))
 {
 //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 
chars.
+//1.7.0_161, 1.8.0_162, it's as long as 3 chars in later 
Java version.
 int len = pCur - pLast;
-if (len > 2)
+if (len > 3)
 return false;
 //we've got the update: 01, 02 etc
 strncpy(buf, pLast, len);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits