Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Windows and Java 11 #9

Merged
merged 18 commits into from
Sep 9, 2020
Merged

Add support for Windows and Java 11 #9

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
11f013d
Experiment with running native-image on Windows
Sep 8, 2020
6b32dbb
Use sbt 1.3.13 to fix windows-2016 issue
Sep 8, 2020
c472288
Avoid duplicate trailing slash on Windows
Sep 8, 2020
15bccfa
Stop using manifest jar on Windows.
Sep 8, 2020
1ed3f7c
Experiment with sbt 1.4.0-RC1
Sep 8, 2020
1421a5b
Add setting key to tweak GraalVM JVM kind
Sep 8, 2020
484e1b4
Tweak Windows SDK installation for Java 8
Sep 8, 2020
4ec1347
Fallback to manual installation for Windows.
Sep 8, 2020
e9ed827
Use full path to native-image binary from JAVA_HOME
Sep 8, 2020
ff642c3
Use native-image.exe
Sep 8, 2020
58ef0cc
Document new Windows installation
Sep 8, 2020
decc2b6
Add Windows to native.yml
Sep 8, 2020
b24aec3
Try to support automatic Windows installation.
Sep 9, 2020
36d6ce5
Remove outdated documentation
Sep 9, 2020
77dc6c4
Hardcode absolute path to Windows binary
Sep 9, 2020
9d5af72
Update readme with more information
Sep 9, 2020
20cfec0
Debug why upload-artifact fails on Windows
Sep 9, 2020
c537de5
Fix bug around binary filename on Windows
Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stop using manifest jar on Windows.
  • Loading branch information
Olafur Pall Geirsson committed Sep 8, 2020
commit 15bccfa477fbaeb4cca16c864703583d2474ab18
5 changes: 4 additions & 1 deletion plugin/src/main/scala/sbtnativeimage/NativeImagePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,15 @@ object NativeImagePlugin extends AutoPlugin {
val manifest = target.in(NativeImageInternal).value / "manifest.jar"
manifest.getParentFile().mkdirs()
createManifestJar(manifest, cp)
val nativeClasspath =
if (Properties.isWin) cp.mkString(File.pathSeparator)
else manifest.absolutePath

// Assemble native-image argument list.
val command = mutable.ListBuffer.empty[String]
command ++= nativeImageCommand.value
command += "-cp"
command += manifest.absolutePath
command += nativeClasspath
command ++= nativeImageOptions.value
command += main.getOrElse(
throw new MessageOnlyException(
Expand Down