diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-06-12 14:31:45 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-06-21 21:46:58 +0200 |
| commit | c71b6f2d52f7df0d7f91524fc161979fc0912e0e (patch) | |
| tree | bd59e824bab98a42fdf8bb4cf351cebc563d1301 /include | |
| parent | 67232f226438a9e73beab9dec90f1a3739088b57 (diff) | |
Allow bootstrap variables in Java user classpath settings, 2nd try
Add a second mode: When a classpath starts with '$', bootstrap variables are recognized.
The classpath must then be provided as URL, not native path.
Change-Id: Idcc229a2b4e9a512b0e712ea932a6e4293907db3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152899
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/jvmfwk/framework.hxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 3c7fe2981436..1726f8e47921 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -387,6 +387,17 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInf JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs( std::vector<std::unique_ptr<JavaInfo>> *parInfo); +/** + * Convert colon-separated userClassPath which might contain bootstrap variables + * (which also might contain colons) to a list of classPaths, keeping bootstrap variables intact. + * + * FIXME: Nested or multiple occurrences of ${...:...:...} are currently not supported. + * + * @param sUserPath colon-separated string of user classpaths + * @return list of user classpaths + */ +JVMFWK_DLLPUBLIC std::vector<OUString> jfw_convertUserPathList(OUString const& sUserPath); + /** determines if a path points to a Java installation. <p>If the path belongs to a JRE installation then it returns the |