Skip to content

Commit fa1bb06

Browse files
committed
fix for windows
1 parent 5d970ce commit fa1bb06

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

pom.xml

+23-8
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<plugin>
115115
<groupId>org.codehaus.mojo</groupId>
116116
<artifactId>exec-maven-plugin</artifactId>
117-
<version>1.1.1</version>
117+
<version>3.1.0</version>
118118
<executions>
119119
<execution>
120120
<!-- Override when building on Windows to use PowerShell & MSVC -->
@@ -125,7 +125,14 @@
125125
</goals>
126126
<configuration>
127127
<executable>powershell</executable>
128-
<commandlineArgs>-ExecutionPolicy Bypass -File ${basedir}/src/main/c/h3-java/build-h3-windows.ps1 ${h3.git.remote} ${h3.git.reference}</commandlineArgs>
128+
<arguments>
129+
<argument>-ExecutionPolicy</argument>
130+
<argument>Bypass</argument>
131+
<argument>-File</argument>
132+
<argument>${project.basedir}/src/main/c/h3-java/build-h3-windows.ps1</argument>
133+
<argument>${h3.git.remote}</argument>
134+
<argument>${h3.git.reference}</argument>
135+
</arguments>
129136
</configuration>
130137
</execution>
131138
</executions>
@@ -198,7 +205,7 @@
198205
</goals>
199206
<configuration>
200207
<files>
201-
<file>${basedir}/h3version.properties</file>
208+
<file>${project.basedir}/h3version.properties</file>
202209
</files>
203210
</configuration>
204211
</execution>
@@ -218,7 +225,7 @@
218225

219226
<!-- Generate the native header file -->
220227
<arg>-h</arg>
221-
<arg>${basedir}/src/main/c/h3-java/src</arg>
228+
<arg>${project.basedir}/src/main/c/h3-java/src</arg>
222229
</compilerArgs>
223230
</configuration>
224231
</plugin>
@@ -245,7 +252,7 @@
245252
<plugin>
246253
<groupId>org.codehaus.mojo</groupId>
247254
<artifactId>exec-maven-plugin</artifactId>
248-
<version>1.1.1</version>
255+
<version>3.1.0</version>
249256
<executions>
250257
<execution>
251258
<id>build-h3-c</id>
@@ -256,8 +263,16 @@
256263
<goal>exec</goal>
257264
</goals>
258265
<configuration>
259-
<executable>${basedir}/src/main/c/h3-java/build-h3.sh</executable>
260-
<commandlineArgs>${h3.git.remote} ${h3.git.reference} ${h3.use.docker} ${h3.system.prune} ${h3.dockcross.tag} ${h3.github.artifacts.use} ${h3.github.artifacts.ref}</commandlineArgs>
266+
<executable>${project.basedir}/src/main/c/h3-java/build-h3.sh</executable>
267+
<arguments>
268+
<argument>${h3.git.remote}</argument>
269+
<argument>${h3.git.reference}</argument>
270+
<argument>${h3.use.docker}</argument>
271+
<argument>${h3.system.prune}</argument>
272+
<argument>${h3.dockcross.tag}</argument>
273+
<argument>${h3.github.artifacts.use}</argument>
274+
<argument>${h3.github.artifacts.ref}</argument>
275+
</arguments>
261276
</configuration>
262277
</execution>
263278
</executions>
@@ -277,7 +292,7 @@
277292
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
278293
<resources>
279294
<resource>
280-
<directory>${basedir}/src/main/resources</directory>
295+
<directory>${project.basedir}/src/main/resources</directory>
281296
<filtering>false</filtering>
282297
</resource>
283298
</resources>

0 commit comments

Comments
 (0)