Restore asterisk expansion in ImageClasspath property of macro options

oracle · Jan 26, 2023 · 47755d2 · 47755d2
1 parent 537bede
commit 47755d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/MacroOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/MacroOptionHandler.java
@@ -98,7 +98,7 @@ private void applyEnabled(MacroOption.EnabledOption enabledOption, String argume
         boolean explicitImageModulePath = enabledOption.forEachPropertyValue(config,
                         "ImageModulePath", entry -> nativeImage.addImageModulePath(Path.of((entry))), PATH_SEPARATOR_REGEX);
         boolean explicitImageClasspath = enabledOption.forEachPropertyValue(config,
-                        "ImageClasspath", entry -> nativeImage.addImageClasspath(Path.of((entry))), PATH_SEPARATOR_REGEX);
+                        "ImageClasspath", entry -> NativeImage.expandAsteriskClassPathElement(entry).forEach(nativeImage::addImageClasspath), PATH_SEPARATOR_REGEX);
         if (!explicitImageModulePath && !explicitImageClasspath) {
             NativeImage.getJars(imageJarsDirectory).forEach(nativeImage::addImageClasspath);
         }

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1690,7 +1690,7 @@ void addCustomImageClasspath(String classpath) {
         }
     }
 
-    public List<Path> expandAsteriskClassPathElement(String cp) {
+    public static List<Path> expandAsteriskClassPathElement(String cp) {
         String separators = Pattern.quote(File.separator);
         if (OS.getCurrent().equals(OS.WINDOWS)) {
             separators += "/"; /* on Windows also / is accepted as valid separator */