diff options
author | Robby <robby@k-state.edu> | 2018-03-31 14:36:53 -0500 |
---|---|---|
committer | Robby <robby@k-state.edu> | 2018-03-31 14:36:53 -0500 |
commit | aeefd703208930f751ef3a4f2c604a25515a00fc (patch) | |
tree | dcd37f26116a68b98d2f1c6e93c41960ff9f4ea0 /build.sc | |
parent | c6572bcf363c1b58142d99c1a7093b67e3fb2e41 (diff) | |
download | mill-aeefd703208930f751ef3a4f2c604a25515a00fc.tar.gz mill-aeefd703208930f751ef3a4f2c604a25515a00fc.tar.bz2 mill-aeefd703208930f751ef3a4f2c604a25515a00fc.zip |
Detect sh/batch launcher, dev.assembly, and release filename.
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 33 |
1 files changed, 16 insertions, 17 deletions
@@ -258,6 +258,13 @@ def launcherScript(jvmArgs: Seq[String], ) } +val isBatch = + scala.util.Properties.isWin && + !(org.jline.utils.OSUtils.IS_CYGWIN + || org.jline.utils.OSUtils.IS_MINGW + || "MSYS" == System.getProperty("MSYSTEM")) + + object dev extends MillModule{ def moduleDeps = Seq(scalalib, scalajslib) def forkArgs = T{ @@ -265,7 +272,7 @@ object dev extends MillModule{ } def launcher = T{ val isWin = scala.util.Properties.isWin - val outputPath = T.ctx().dest / "run" + val outputPath = T.ctx().dest / (if (isBatch) "run.bat" else "run") write(outputPath, prependShellScript()) @@ -280,7 +287,7 @@ object dev extends MillModule{ } def assembly = T{ - val filename = "mill" + val filename = if (isBatch) "mill.bat" else "mill" mv(super.assembly().path, T.ctx().dest / filename) PathRef(T.ctx().dest / filename) } @@ -307,29 +314,21 @@ object dev extends MillModule{ } } -private def releaseHelper(dest: Path, - cp: Agg[Path], - ver: String) - (implicit ctx: mill.util.Ctx.Dest): PathRef = { +def release = T{ + val dest = T.ctx().dest + val filename = if (isBatch) "mill.bat" else "mill" mv( createAssembly( - cp, + dev.runClasspath().map(_.path), prependShellScript = launcherScript( - Seq("-DMILL_VERSION=" + ver), + Seq("-DMILL_VERSION=" + publishVersion()._2), Agg("$0"), Agg("%~dpnx0") ) ).path, - dest / "mill" + dest / filename ) - PathRef(dest / "mill") -} - -def release = T{ - releaseHelper( - T.ctx().dest, - dev.runClasspath().map(_.path), - publishVersion()._2) + PathRef(dest / filename) } val isMasterCommit = { |