summaryrefslogtreecommitdiff
path: root/jvmfwk/inc/vendorplugin.hxx
AgeCommit message (Collapse)Author
2019-04-26tdf#42949 Fix IWYU warnings in jvmfwk/ & jvmaccess/Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I6c1041f261ba5a6f81efd3dcbc12baf2746e1839 Reviewed-on: https://gerrit.libreoffice.org/71217 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-09tdf#124503: Support JRE installations with unknown java.vendor propertyStephan Bergmann
After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon Corretto" to our hard-coded list, there is now reports that at least Debian and Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety set to string like "Debian" or "Ubuntu". Instead of trying to catch up with an ever-growing hard-coded list, it is probably better to stop relying exclusively on such a hard-coded list, and for unknown vendor values, try out whether the SunInfo backend (which supports the "generic" OpenJDK) would be able to handle the given JRE. (For simplicity, assume that any versions of such JREs are supported. Our baseline is Java 6, and there are unlikely any older versions of JREs from unknown vendors out there. If this turns out to be problematic, we could include information about problematic vendors after all, or add a general check that JREs from unknown vendors are at least Java 6.) Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to take a vendorSettings parameter instead, and VendorSettings::getVersionInformation has been changed to return a boost::optional, so that unknown vendors can be handled gracefully. Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9 Reviewed-on: https://gerrit.libreoffice.org/70460 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-10-23loplugin:includeform: jvmfwkStephan Bergmann
Change-Id: I7292ced23647692fdc85a3c234fb1469a91ad0ea
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getAllJavaInfosStephan Bergmann
Change-Id: I2beb95c42c666a788a87a45f59bc15ccfcf25aa6
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoByPathStephan Bergmann
Change-Id: I3511eaa12bb689a374a775204a3480d7c667a915
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoFromJavaHomeStephan Bergmann
Change-Id: I8be48d1eec799f347a5edaa67837cf1bbf4d2cc3
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfosFromPathStephan Bergmann
...thereby fixing a memory leak Change-Id: I1aa91eeb407987abcdaa5221f4abd447f881c5d2
2017-04-12Simplify jfw::VersionInfoStephan Bergmann
Change-Id: I2cc1071bbaf9c68fbd621d6c0c6953b7646b1a62
2017-04-11Assert obvious preconditions instead of returning javaPluginError:InvalidArgStephan Bergmann
Change-Id: I93bb3aaa0106bce98995f843ee036c9570f6aaf0
2017-04-11sal_Bool -> boolStephan Bergmann
Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda
2017-03-13Related tdf#54443 List only matching JREsSamuel Mehrbrodt
I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5 Reviewed-on: https://gerrit.libreoffice.org/35026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-12-25tdf#95416 Fix include filetamsil1amani3
Moved elements.hxx and fwkutil.hxx to jvmfwk/inc and changed the #include line in vendorplugin.hxx Change-Id: Ida7395e952c482af92c0561a7756be7cd0578b9f Reviewed-on: https://gerrit.libreoffice.org/32415 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-05-22Convert javaPluginError to scoped enumNoel Grandin
Change-Id: Ib3a32227d50fa9e0f9cc4106ce40a4c3e840f8c7 Reviewed-on: https://gerrit.libreoffice.org/25206 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-30Fix typosAndrea Gelmini
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-03-10No more need for jfw_freeJavaInfoStephan Bergmann
Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3
2016-03-09include/jvmfwk/*.h -> .hxx (only ever included from C++ code)Stephan Bergmann
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
2016-02-09Remove excess newlinesChris Sherlock
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2014-12-15Remove obsolete commentStephan Bergmann
Change-Id: I66dcf6284bd1b7afb1c60c838bbbb2052e06072b
2014-12-15Check each potential JRE location only onceStephan Bergmann
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-15fdo#83753: consider JAVA_HOME and PATH when selecting JREMichael Weghorn
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-11-19changed type of parameters from rtl_uString to OUStringMichael Weghorn
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-10-09vendorplugin.h is jvmfwk-internal (and no need for extern "C")Stephan Bergmann
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
generated by cgit (git 2.34.1) at 2024-07-15 12:30:56 +0000