From 7795a2adc0a724220440dca997495043902f1384 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Mon, 12 Jun 2023 14:31:45 +0200 Subject: 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 --- include/jvmfwk/framework.hxx | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/jvmfwk/framework.hxx') diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 8f7eb8a2ad29..d3cf01791e6b 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -345,6 +345,17 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr>* 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 jfw_convertUserPathList(OUString const& sUserPath); + /** determines if a path points to a Java installation.

If the path belongs to a JRE installation then it returns the -- cgit