Skip to content

Commit 5a86516

Browse files
committed
split build arguments correcltly
1 parent c87de63 commit 5a86516

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -243,29 +243,11 @@ protected List<String> getBuildArgs() throws MojoExecutionException {
243243

244244
if (buildArgs != null && !buildArgs.isEmpty()) {
245245
for (String buildArg : buildArgs) {
246-
if(buildArg.startsWith("\\Q") ||
247-
buildArg.startsWith("-H:ConfigurationFileDirectories")) {
246+
if(buildArg.startsWith("\\Q") || buildArg.startsWith("-H")) {
248247
cliArgs.add(buildArg);
249248
continue;
250249
}
251-
String[] args = buildArg.split("\\s+");
252-
int i=0;
253-
while(i < args.length) {
254-
String a =args[i];
255-
if (a.charAt(0) == System.getProperty("user.home").charAt(0)) {
256-
StringBuilder path = new StringBuilder(a);
257-
i++;
258-
while( i< args.length && args[i].toLowerCase().charAt(0) <= 'z' &&
259-
args[i].toLowerCase().charAt(0) >= 'a') {
260-
path.append(" ").append(args[i]);
261-
i++;
262-
}
263-
cliArgs.add(path.toString());
264-
} else {
265-
cliArgs.add(a);
266-
i++;
267-
}
268-
}
250+
cliArgs.addAll(Arrays.asList(buildArg.split("\\s+", 2)));
269251
}
270252
}
271253

native-maven-plugin/src/testFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ abstract class AbstractGraalVMMavenFunctionalTest extends Specification {
7474
boolean IS_MAC = System.getProperty("os.name", "unknown").contains("Mac");
7575

7676
def setup() {
77-
var home_dir = Path.of(System.getProperty("user.home"))
78-
testDirectory = home_dir.resolve("tests")
77+
Path HomeDir = Path.of(System.getProperty("user.home"))
78+
testDirectory = HomeDir.resolve("tests")
7979

8080
if (Files.notExists(testDirectory)) {
8181
Files.createDirectory(testDirectory)
@@ -89,8 +89,6 @@ abstract class AbstractGraalVMMavenFunctionalTest extends Specification {
8989
}
9090

9191
def cleanup() {
92-
93-
//cleanup test directory and all it's sub directories
9492
Files.walkFileTree(testDirectory, new SimpleFileVisitor<Path>() {
9593
@Override
9694
FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {

0 commit comments

Comments
 (0)