diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 19:49:53 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 19:49:53 -0700 |
commit | 2d72abe64de8dbd98cabc688ce4bb57f733a1d12 (patch) | |
tree | 8077b61a6aabbec9675834f9cf9deb5711318b6d /main/src | |
parent | 19021b773438e24da47f6d0e94e69e5f58625cac (diff) | |
download | mill-2d72abe64de8dbd98cabc688ce4bb57f733a1d12.tar.gz mill-2d72abe64de8dbd98cabc688ce4bb57f733a1d12.tar.bz2 mill-2d72abe64de8dbd98cabc688ce4bb57f733a1d12.zip |
migrate client module onto new JavaModule trait
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/mill/Main.scala | 15 | ||||
-rw-r--r-- | main/src/mill/main/Server.scala | 28 |
2 files changed, 24 insertions, 19 deletions
diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala index 4cbf30fa..734d61e2 100644 --- a/main/src/mill/Main.scala +++ b/main/src/mill/Main.scala @@ -11,21 +11,6 @@ import mill.eval.Evaluator import mill.util.DummyInputStream -object ServerMain extends mill.clientserver.ServerMain[Evaluator.State]{ - def main0(args: Array[String], - stateCache: Option[Evaluator.State], - mainInteractive: Boolean, - stdin: InputStream, - stdout: PrintStream, - stderr: PrintStream) = Main.main0( - args, - stateCache, - mainInteractive, - DummyInputStream, - stdout, - stderr - ) -} object Main { def main(args: Array[String]): Unit = { diff --git a/main/src/mill/main/Server.scala b/main/src/mill/main/Server.scala index ac75dfd0..c0d75c87 100644 --- a/main/src/mill/main/Server.scala +++ b/main/src/mill/main/Server.scala @@ -3,25 +3,45 @@ package mill.main import java.io._ import java.net.Socket +import mill.Main import org.scalasbt.ipcsocket._ +import mill.client._ +import mill.eval.Evaluator +import mill.util.DummyInputStream trait ServerMain[T]{ + var stateCache = Option.empty[T] + def main0(args: Array[String], + stateCache: Option[T], + mainInteractive: Boolean, + stdin: InputStream, + stdout: PrintStream, + stderr: PrintStream): (Boolean, Option[T]) +} + +object ServerMain extends mill.main.ServerMain[Evaluator.State]{ def main(args0: Array[String]): Unit = { new Server( args0(0), this, () => System.exit(0), 300000, - Locks.files(args0(0)) + mill.client.Locks.files(args0(0)) ).run() } - var stateCache = Option.empty[T] def main0(args: Array[String], - stateCache: Option[T], + stateCache: Option[Evaluator.State], mainInteractive: Boolean, stdin: InputStream, stdout: PrintStream, - stderr: PrintStream): (Boolean, Option[T]) + stderr: PrintStream) = Main.main0( + args, + stateCache, + mainInteractive, + DummyInputStream, + stdout, + stderr + ) } |