Skip to content

Commit 7aafc16

Browse files
committed
graalpy executable on windows is graalpy.cmd
1 parent 03ba786 commit 7aafc16

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

graalpython/lib-graalpython/modules/standalone/templates/java_bindings_pom.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<maven.jar.plugin.version>{mvn-jar-plugin}</maven.jar.plugin.version>
5353
<graal.sdk.version>{graal-sdk-version}</graal.sdk.version>
5454
<native.image.maven.plugin.version>{native-image-mvn-plugin}</native.image.maven.plugin.version>
55+
<graalpy.executable>${env.JAVA_HOME}/bin/graalpy</graalpy.executable>
5556
</properties>
5657

5758
<build>
@@ -67,21 +68,31 @@
6768
<goal>exec</goal>
6869
</goals>
6970
<configuration>
70-
<executable>${env.JAVA_HOME}/bin/graalpy</executable>
71+
<executable>${graalpy.executable}</executable>
7172
<arguments>
7273
<argument>-c</argument>
7374
<argument>__graalpython__.list_files('${project.basedir}/src/main/resources/{vfs-prefix}', '${project.build.directory}/classes/{vfs-prefix}/{files-list-name}')</argument>
74-
</arguments>
75+
</arguments>
7576
</configuration>
7677
</execution>
7778
</executions>
7879
</plugin>
7980
</plugins>
8081
</build>
81-
82+
8283
<profiles>
8384
<profile>
84-
<id>jar</id>
85+
<properties>
86+
<graalpy.executable>${env.JAVA_HOME}/bin/graalpy.cmd</graalpy.executable>
87+
</properties>
88+
<activation>
89+
<os>
90+
<family>windows</family>
91+
</os>
92+
</activation>
93+
</profile>
94+
<profile>
95+
<id>jar</id>
8596
<dependencies>
8697
<dependency>
8798
<groupId>org.graalvm.sdk</groupId>
@@ -98,7 +109,7 @@
98109
<configuration>
99110
<archive>
100111
<manifest>
101-
<addClasspath>true</addClasspath>
112+
<addClasspath>true</addClasspath>
102113
<mainClass>Py2BinLauncher</mainClass>
103114
</manifest>
104115
</archive>
@@ -118,7 +129,7 @@
118129
<configuration>
119130
<archive>
120131
<manifest>
121-
<addClasspath>true</addClasspath>
132+
<addClasspath>true</addClasspath>
122133
<mainClass>Py2BinLauncher</mainClass>
123134
</manifest>
124135
</archive>

graalpython/lib-graalpython/modules/standalone/templates/polyglot_app_pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<maven.jar.plugin.version>{mvn-jar-plugin}</maven.jar.plugin.version>
5353
<graal.sdk.version>{graal-sdk-version}</graal.sdk.version>
5454
<native.image.maven.plugin.version>{native-image-mvn-plugin}</native.image.maven.plugin.version>
55+
<graalpy.executable>${env.JAVA_HOME}/bin/graalpy</graalpy.executable>
5556
</properties>
5657

5758
<build>
@@ -80,7 +81,7 @@
8081
<goal>exec</goal>
8182
</goals>
8283
<configuration>
83-
<executable>${env.JAVA_HOME}/bin/graalpy</executable>
84+
<executable>${graalpy.executable}</executable>
8485
<arguments>
8586
<argument>-c</argument>
8687
<argument>__graalpython__.list_files('${project.basedir}/src/main/resources/{vfs-prefix}', '${project.build.directory}/classes/{vfs-prefix}/{files-list-name}')</argument>
@@ -188,7 +189,16 @@
188189
</plugins>
189190
</build>
190191
</profile>
191-
192+
<profile>
193+
<properties>
194+
<graalpy.executable>${env.JAVA_HOME}/bin/graalpy.cmd</graalpy.executable>
195+
</properties>
196+
<activation>
197+
<os>
198+
<family>windows</family>
199+
</os>
200+
</activation>
201+
</profile>
192202
<profile>
193203
<id>prepare-venv</id>
194204
<!-- create a python venv in resources/vfs if it does not exist yet -->
@@ -206,7 +216,7 @@
206216
<goal>exec</goal>
207217
</goals>
208218
<configuration>
209-
<executable>${env.JAVA_HOME}/bin/graalpy</executable>
219+
<executable>${graalpy.executable}</executable>
210220
<arguments>
211221
<argument>-m</argument>
212222
<argument>venv</argument>

0 commit comments

Comments
 (0)