Merge pull request #7663 from ctomc/windows-native

Changes to get native build work on Windows with GraalVM Java 11
quarkusio · Mar 7, 2020 · 49d0129 · 49d0129
2 parents 2b3ec9c + 87bc3d0
commit 49d0129
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -96,7 +96,7 @@
         <jboss-logging-annotations.version>2.1.0.Final</jboss-logging-annotations.version>
         <slf4j.version>1.7.29</slf4j.version>
         <slf4j-jboss-logging.version>1.2.0.Final</slf4j-jboss-logging.version>
-        <wildfly-common.version>1.5.3.Final-format-001</wildfly-common.version>
+        <wildfly-common.version>1.5.4.Final-format-001</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>1.11.2.Final</wildfly-elytron.version>
         <jboss-modules.version>1.8.7.Final</jboss-modules.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -338,6 +338,9 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
             if (exitCode != 0) {
                 throw imageGenerationFailed(exitCode, command);
             }
+            if (IS_WINDOWS) { //once image is generated it gets added .exe on windows
+                executableName = executableName + ".exe";
+            }
             Path generatedImage = outputDir.resolve(executableName);
             Path finalPath = outputTargetBuildItem.getOutputDirectory().resolve(executableName);
             IoUtils.copy(generatedImage, finalPath);