diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 14:00:12 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 14:00:12 -0700 |
| commit | 135110a8e0f2b5feb0eb3a3f82aa90a84ffdfd1f (patch) | |
| tree | 202dc23a2cb0778548f70c0573dbd484f655f22c /build.sc | |
| parent | 9295d5240a417cd09c33317ab2d2a99a36e50485 (diff) | |
| download | mill-135110a8e0f2b5feb0eb3a3f82aa90a84ffdfd1f.tar.gz mill-135110a8e0f2b5feb0eb3a3f82aa90a84ffdfd1f.tar.bz2 mill-135110a8e0f2b5feb0eb3a3f82aa90a84ffdfd1f.zip | |
enable jna.nosys=true to try and fix appveyor build
Diffstat (limited to 'build.sc')
| -rwxr-xr-x | build.sc | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -212,7 +212,8 @@ object integration extends MillModule{ scalaworker.testArgs() ++ Seq( "-DMILL_TESTNG=" + testng.runClasspath().map(_.path).mkString(","), - "-DMILL_VERSION=" + build.publishVersion()._2 + "-DMILL_VERSION=" + build.publishVersion()._2, + "-Djna.nosys=true" ) ++ (for((k, v) <- testRepos()) yield s"-D$k=$v") } @@ -281,9 +282,14 @@ val isBatch = object dev extends MillModule{ def moduleDeps = Seq(scalalib, scalajslib) - def forkArgs = T{ - scalalib.testArgs() ++ scalajslib.testArgs() ++ scalaworker.testArgs() - } + def forkArgs = + scalalib.testArgs() ++ + scalajslib.testArgs() ++ + scalaworker.testArgs() ++ + // Workaround for Zinc/JNA bug + // https://github.com/sbt/sbt/blame/6718803ee6023ab041b045a6988fafcfae9d15b5/main/src/main/scala/sbt/Main.scala#L130 + Seq("-Djna.nosys=true") + def launcher = T{ val isWin = scala.util.Properties.isWin val outputPath = T.ctx().dest / (if (isBatch) "run.bat" else "run") |