Skip to content

Commit b1be7d2

Browse files
committed
The plugin introduced some "windows fix"[1] that causes current arg parsing to fail. Solution seems to be to split each arg in own line, but that introduced another set of challenges.
[1] graalvm/native-build-tools#609 Supersedes apache#1135
1 parent e519179 commit b1be7d2

File tree

3 files changed

+42
-25
lines changed

3 files changed

+42
-25
lines changed

client/pom.xml

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
<properties>
3434
<maven.compiler.release>11</maven.compiler.release>
35-
<graalvm-native-static-opt />
36-
<graalvm-native-glibc-opt />
3735
<patchelf.skip>true</patchelf.skip>
3836
</properties>
3937

@@ -190,9 +188,19 @@
190188
<family>!mac</family>
191189
</os>
192190
</activation>
193-
<properties>
194-
<graalvm-native-static-opt>-H:+StaticExecutableWithDynamicLibC</graalvm-native-static-opt>
195-
</properties>
191+
<build>
192+
<plugins>
193+
<plugin>
194+
<groupId>org.graalvm.buildtools</groupId>
195+
<artifactId>native-maven-plugin</artifactId>
196+
<configuration>
197+
<buildArgs combine.self="append">
198+
<buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg>
199+
</buildArgs>
200+
</configuration>
201+
</plugin>
202+
</plugins>
203+
</build>
196204
</profile>
197205

198206
<profile>
@@ -205,12 +213,21 @@
205213
<exists>target/graalvm-libs-for-glibc-2.12</exists>
206214
</file>
207215
</activation>
208-
<properties>
209-
<graalvm-native-glibc-opt>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc
210-
-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12
211-
-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</graalvm-native-glibc-opt>
212-
<patchelf.skip>false</patchelf.skip>
213-
</properties>
216+
<build>
217+
<plugins>
218+
<plugin>
219+
<groupId>org.graalvm.buildtools</groupId>
220+
<artifactId>native-maven-plugin</artifactId>
221+
<configuration>
222+
<buildArgs combine.self="append">
223+
<buildArg>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc</buildArg>
224+
<buildArg>-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
225+
<buildArg>-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.12</buildArg>
226+
</buildArgs>
227+
</configuration>
228+
</plugin>
229+
</plugins>
230+
</build>
214231
</profile>
215232

216233
<profile>
@@ -227,17 +244,17 @@
227244
<skip>false</skip>
228245
<mainClass>org.mvndaemon.mvnd.client.DefaultClient</mainClass>
229246
<imageName>mvnd</imageName>
230-
<buildArgs>--no-fallback
231-
-march=compatibility
232-
-H:+UnlockExperimentalVMOptions
233-
${graalvm-native-static-opt}
234-
${graalvm-native-glibc-opt}
235-
-H:IncludeResources=org/mvndaemon/mvnd/.*
236-
-H:IncludeResources=mvnd-bash-completion.bash
237-
-H:-ParseRuntimeOptions
238-
-H:+AddAllCharsets
239-
-H:+ReportExceptionStackTraces
240-
-ea</buildArgs>
247+
<buildArgs combine.self="append">
248+
<buildArg>--no-fallback</buildArg>
249+
<buildArg>-march=compatibility</buildArg>
250+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
251+
<buildArg>-H:IncludeResources=org/mvndaemon/mvnd/.*</buildArg>
252+
<buildArg>-H:IncludeResources=mvnd-bash-completion.bash</buildArg>
253+
<buildArg>-H:-ParseRuntimeOptions</buildArg>
254+
<buildArg>-H:+AddAllCharsets</buildArg>
255+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
256+
<buildArg>-ea</buildArg>
257+
</buildArgs>
241258
</configuration>
242259
<executions>
243260
<execution>

integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<phase>none</phase>
107107
</execution>
108108
<execution>
109-
<id>mvn-39</id>
109+
<id>java-test</id>
110110
<goals>
111111
<goal>test</goal>
112112
</goals>
@@ -192,7 +192,7 @@
192192
<artifactId>maven-failsafe-plugin</artifactId>
193193
<executions>
194194
<execution>
195-
<id>native-39</id>
195+
<id>native-test</id>
196196
<goals>
197197
<goal>integration-test</goal>
198198
<goal>verify</goal>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<commons-compress.version>1.27.1</commons-compress.version>
8080
<!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
8181
<graalvm.version>24.0.2</graalvm.version>
82-
<graalvm.plugin.version>0.10.2</graalvm.plugin.version>
82+
<graalvm.plugin.version>0.10.3</graalvm.plugin.version>
8383
<groovy.version>4.0.23</groovy.version>
8484
<jakarta.inject.version>1.0</jakarta.inject.version>
8585
<jline.version>3.26.3</jline.version>

0 commit comments

Comments
 (0)