summaryrefslogtreecommitdiff
path: root/jvmfwk/plugins/sunmajor/pluginlib
AgeCommit message (Collapse)AuthorFilesLines
2015-07-11tdf#92483 fix initializing JRE on Win 64bit (load java's msvcr100.dll)Christian Lohmaier1-1/+1
problem is that the offsets/sizes are of different type than ptrdiff_t, and when using without casting, the resulting address is way off... Change-Id: I7b1cdd611c8c4b317cd33ca8fbbda2e7e8f5f4fc Reviewed-on: https://gerrit.libreoffice.org/16938 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1b4d27a3badddd2648c3f02cd234ca74c5a40e6b) Reviewed-on: https://gerrit.libreoffice.org/16950
2015-06-24jvmfwk: pass along -Xss to JVM on AMD64 tooMichael Stahl1-2/+2
The PythonTest_dbacces_python in a clang ASAN build on F21 started to fail with StackOverflowError in JNI_CreateJavaVM on the main thread, and this fixes the problem. Seen with java-1.8.0-openjdk-1.8.0.45-39.b14.fc21.x86_64 Change-Id: I87dfb4b62d547b334c19261aad88b4856489776f (cherry picked from commit bb6399937270fb149639248dd1a28775948f7285)
2015-05-29Support Azul Zulu JRE on Linux and Mac OS X, tooStephan Bergmann1-1/+2
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da (cherry picked from commit 8541b178f4155c8d72a876245433a1aaf3d2634f)
2015-05-29Support Azul Zulu JRE (at least on Windows)Stephan Bergmann2-1/+3
(<http://www.azulsystems.com/products/zulu/downloads> also offers it for Linux and Mac OS X, so it could be added to more javavendors_*.xml if need be; I only checked it actually works with a Windows 64-bit LO build) Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6 (cherry picked from commit 0f95f8ffd7a3685ca53876005a9c96f2e2e7bc99)
2015-04-27More loplugin:simplifyboolStephan Bergmann4-7/+7
Change-Id: I51e7a11149676a8b5396d9eb993a509859cdf725
2015-04-23Improved loplugin:literaltoboolconversion looking into cond. exprs.Stephan Bergmann1-1/+1
...automatic rewriter fixes Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
2015-04-22Various #include <sal/log.hxx> fixupsStephan Bergmann1-0/+1
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. Cleaned up some, but something like grep -FwL sal/log.hxx $(git grep -Elw \ 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx) shows lots more files that potentially need fixing before the include can be removed from rtl/string.hxx and rtl/ustring.hxx. Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
2015-03-28Clean up C-style casts from pointers to voidStephan Bergmann1-2/+2
Change-Id: I302d313f2d14d908672d4534aad1818e820eaae4
2015-03-27loplugin:staticfunctionNoel Grandin1-1/+1
Change-Id: I10c30ef28e7321882a720d1e7869a75a89febfc5
2015-03-02V805: Decreased performanceCaolán McNamara1-1/+1
Change-Id: I822c5ebc321ebda87c238a1781a31793c1623e34
2015-01-20Some more loplugin:cstylecast: jvmfwkStephan Bergmann1-3/+3
Change-Id: Iaa1be4b338b75c340555eb4bf0760cadca16713f
2015-01-08avoid copying of vectorMichael Weghorn1-17/+7
Change-Id: I06ce27f4fa52637bbeaa6d84fdecdf81364e15a7 Reviewed-on: https://gerrit.libreoffice.org/13489 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-07jvmfwk: fix Android buildMiklos Vajna1-1/+1
Change-Id: Ib183158e51f7bebbb6add92e460a33fa132c1c9d
2014-12-18Some cppcheck cleanings: Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-3/+3
Change-Id: I899164412ad90653b4228423283f9fbd4cb5fccc
2014-12-18jvmfwk: Use appropriate OUString functions on string constantsStephan Bergmann1-2/+2
Change-Id: I5a16fdd9217f0523212842650d74f504f17848fd
2014-12-16jvmfwk: Use appropriate OUString functions on string constantsStephan Bergmann2-9/+4
Change-Id: I3e0b70c61c4e92f2cbd27ce7c45e67ae04dfe14c
2014-12-16Related fdo#83753: Fix JVM_ONE_PATH_CHECK feature againStephan Bergmann1-2/+4
Change-Id: I1dc3b0db6295c43a9d29576b81870b4a293a61aa
2014-12-15Check each potential JRE location only onceStephan Bergmann4-265/+103
i.e., after recent "fdo#83753: consider JAVA_HOME and PATH when selecting JRE" fix, if jfw_findAndSelectJRE found no suitable JRE in jfw_plugin_getJavaInfoFromJavaHome or jfw_plugin_getJavaInfosFromPath, do not re-check those locations in jfw_plugin_getAllJavaInfos. Change-Id: If4e085b4fceff5b2494c7b7b84ac51691dbc78cc
2014-12-15Rename getJREInfoByPath overload to getAndAddJREInfoByPathStephan Bergmann2-41/+27
Change-Id: Ib6eac731a4b8193a8d9b9132da78e7961aec22ab
2014-12-15getJREInfoFromBinPath return value is unusedStephan Bergmann2-9/+4
Change-Id: I360d7cb7c03e78739883db4b989ba5f31bc8e24b
2014-12-15fdo#83753: consider JAVA_HOME and PATH when selecting JREMichael Weghorn3-3/+126
adapted algorithm that selects the Java runtime to be used so that Java installations associated with the JAVA_HOME and PATH environment variables are preferred over others Java installations are now analysed in the following order: * installation that the JAVA_HOME environment variable refers to (if it is set) * Java installations in PATH * other Java installation (algorithm that was used before) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Conflicts: jvmfwk/source/framework.cxx Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
2014-12-10java: unused importsNoel Grandin1-1/+0
Change-Id: I05824a6f19a5f3048a52101b96f6bf3d3099df08 Reviewed-on: https://gerrit.libreoffice.org/13403 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-05java: remove some unused local variablesNoel Grandin1-1/+1
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
2014-11-26fix higher debug level buildCaolán McNamara1-0/+1
Change-Id: Ie61be2bd009b71bbbb7261865d026faf3af706ce
2014-11-19changed type of parameters from rtl_uString to OUStringMichael Weghorn1-45/+28
changed type of several parameters of the functions jfw_plugin_getAllJavaInfos and jfw_plugin_getJavaInfoByPath from rtl_uString to OUString Change-Id: I80feb311542e6ccded9f9924f800c75a7e14a1e7 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-18Pass by refStephan Bergmann1-1/+1
Change-Id: I88def7e41a31948d1d7205cd5522b63de6be5f80
2014-11-18sunjavaplugin.cxx: extracted function for Java version checkMichael Weghorn1-133/+110
extracted the (duplicate) code which is responsible to check the Java version requirements in the two functions "jfw_plugin_getAllJavaInfos" and "jfw_plugin_getJavaInfoByPath" Change-Id: I8acb198c4b4aaee77dc84bc42ff1fc2e0da2aba7 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-18remove duplicate code lineMichael Weghorn1-1/+0
Change-Id: Ia1e9d2b31698db23029e4dd5f0f7659acff5d30f Reviewed-on: https://gerrit.libreoffice.org/12951 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-17sal: clean up public headers with include-what-you-useMichael Stahl1-0/+2
Sadly cannot forward declare "struct {...} TimeValue;". rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h was painful enough for now... Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini3-6/+6
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-05markup with event type not checker typeCaolán McNamara1-1/+1
Change-Id: I14c0c5d90b67000cb4fe9e6be647854abfe784da
2014-11-05fdo#38835 strip out OUString globalsNoel Grandin1-2/+2
they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
2014-10-30Fixed typos. No automatic tools (sed, and so on).Andrea Gelmini1-1/+1
Change-Id: Ia43976d84eede6f699381bc4f3daf89b95e4cb4f Reviewed-on: https://gerrit.libreoffice.org/12150 Reviewed-by: Bryan Quigley <gquigs@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-29coverity#1247624 oslModule -> osl::ModuleCaolán McNamara1-15/+14
should silence warning, still actually avoid dlclose on the non-error path Change-Id: Ibc522bf1067feb04def7d7284eee59878ddc6f47
2014-10-27Work around OpenJDK's os::workaround_expand_exec_shield_cs_limitStephan Bergmann1-0/+40
Change-Id: Iea1b6354764db0a22976b3de49bf3e22ccb7243e
2014-10-27Clean up JNI_CreateJavaVM option codeStephan Bergmann1-36/+34
Change-Id: I1902c73a72f29e948e479a2ae4776f2dff77b2b5
2014-10-21Remove unnecessary jfw_plugin::getVendorNamesStephan Bergmann2-20/+2
Change-Id: I3c134c27db4c1496fcacc519da68af10ab3ce574
2014-10-20Clean up VendorBase (virtual) member functions furtherStephan Bergmann4-27/+23
Change-Id: If6b9355c6992eb6651f71c0944a93af0856ef1c7
2014-10-20Clean up VendorBase (virtual) member functionsStephan Bergmann5-39/+23
Change-Id: I1377dfded1246c8e96db3addc28489886c7f2d99
2014-10-20Missing "Stephan Bergmann1-1/+1
Change-Id: I5d596f85fe11bc9336e1669d571795f3dfc70c6c
2014-10-20Clean jvmfwk tracing outputTor Lillqvist3-46/+29
Change-Id: I070fb24e9466d697a6014bd65635f6cda8736819
2014-10-20Skip vendors that are irrelevantTor Lillqvist1-2/+7
There surely are no Apple JVMs for other OSes than OS X. Correspondingly, there surely are no IBM, Blackdown, BEA, FSF or FreeBSD JVMs for OS X. At least not ones that would be relevant today. Change-Id: I0ee6f904665a2145771802beffe54268718bef50
2014-10-09vendorplugin.h is jvmfwk-internal (and no need for extern "C")Stephan Bergmann1-5/+1
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
2014-10-07java: simplify some for loops to while loopsNoel Grandin1-1/+1
Change-Id: I323ab12c634d3baa4f624b63d7d483112c23192c
2014-09-29loplugin: cstylecastNoel Grandin2-3/+3
Change-Id: I53b69a488c70769cbb841db519bc28fd211dc087
2014-09-11jvmfwk: print a warning if running java faMichael Stahl1-0/+16
Change-Id: Ibfcd6678ed1503cfab0881f3ec67c4c158d798cb
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist1-2/+10
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-08-29Linux AArch64 portStephan Bergmann1-0/+2
Change-Id: I37044a37348b203944a8eb9d2204e619055f069d
2014-08-21jvmfwk: Removes the checking for W98 in JREProperties.javarbuj1-15/+1
Change-Id: Ia5be6b5893abef084b5e4203f9f02919289ce055 Reviewed-on: https://gerrit.libreoffice.org/11054 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21openjdk appears to use ppc64/server/libjvm.so and not ppc64le/server/libjvm.soCaolán McNamara1-5/+1
Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee