diff options
| author | Robby <robby@santoslab.org> | 2018-04-07 08:23:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 08:23:42 -0500 |
| commit | ccb67db3759a16e95a75920d87281185310ccd81 (patch) | |
| tree | b901d0173eaf48489583c9a905914baaaf3486ab /main | |
| parent | e628c84be7cf0b7bb00ba2141635d29503203fc4 (diff) | |
| download | mill-ccb67db3759a16e95a75920d87281185310ccd81.tar.gz mill-ccb67db3759a16e95a75920d87281185310ccd81.tar.bz2 mill-ccb67db3759a16e95a75920d87281185310ccd81.zip | |
Merge April 1 - 4, 2018 changes on master (#283)
* fix build
* Detect sh/batch launcher, dev.assembly, and release filename.
* Updated appveyor cache.
* Added some entries for master in readme.md changelog.
* Updated readme.md changelog.
* fixes #173; use default(compile) configuration for deps as default (#270)
* revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268
* Updated ci tests.
* Reverted Ammonite caching workaround (a796f0a) now that it's fixed
* Changed ci/test-mill-0.sh to use interactive mode due to intermittent client failures to connect to server in travis
* Added ci/test-mill-bootstrap.sh (ci/test-mill-0.sh with bootstrapping) and use it on oraclejdk9 instead of ci/test-mill-0.sh
* Upgraded mill used for ci to 0.1.7-29-f5097f
* revive #254 and fix #268 (#274)
* Test mill batch (.bat) in AppVeyor
* fix minor typos in docs
* Sync Ammonite in ScalaModule (with build.sc).
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/mill/modules/Jvm.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index 8e9d443e..287dc624 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -355,7 +355,11 @@ object Jvm { jvmArgs: Seq[String]) (implicit ctx: Ctx.Dest)= { val isWin = scala.util.Properties.isWin - val outputPath = ctx.dest / "run" + val isBatch = isWin && + !(org.jline.utils.OSUtils.IS_CYGWIN + || org.jline.utils.OSUtils.IS_MINGW + || "MSYS" == System.getProperty("MSYSTEM")) + val outputPath = ctx.dest / (if (isBatch) "run.bat" else "run") val classPathStrs = classPath.map(_.toString) write(outputPath, launcherUniversalScript(mainClass, classPathStrs, classPathStrs, jvmArgs)) |