diff options
author | Li Haoyi <haoyi@dropbox.com> | 2013-12-10 00:14:13 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2013-12-10 00:14:13 -0800 |
commit | e8cbb1b7609c3764a61d0965d556a84ee275413b (patch) | |
tree | 0115764dbd83d41a898a2ec9bfebfa433cd13607 | |
parent | adadeee3c2c34b44560c1aa98aaeb7fe332cc9d7 (diff) | |
download | workbench-e8cbb1b7609c3764a61d0965d556a84ee275413b.tar.gz workbench-e8cbb1b7609c3764a61d0965d556a84ee275413b.tar.bz2 workbench-e8cbb1b7609c3764a61d0965d556a84ee275413b.zip |
tweak tweak
-rw-r--r-- | package.scala | 11 | ||||
-rw-r--r-- | project/Build.scala | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/package.scala b/package.scala index 2e42673..9c989b0 100644 --- a/package.scala +++ b/package.scala @@ -62,20 +62,21 @@ package object workbench extends sbt.Plugin { def trace(t: => Throwable): Unit = server.value.send(Json.arr("print", "error", t.toString)) } } + clientLogger.setSuccessEnabled(true) val currentFunction = extraLoggers.value (key: ScopedKey[_]) => clientLogger +: currentFunction(key) }, refreshBrowsers := { - streams.value.log("Reloading Pages...") + streams.value.log.info("workbench: Reloading Pages...") server.value.send(Json.arr("reload")) }, updateBrowsers := { - println("partialReload") + server.value send Json.arr("clear") ((crossTarget in Compile).value * "*.js").get.map{ (x: File) => - println("Checking " + x.getName) + streams.value.log.info("workbench: Checking " + x.getName) FileFunction.cached(streams.value.cacheDirectory / x.getName, FilesInfo.lastModified, FilesInfo.lastModified){ (f: Set[File]) => - println("Refreshing " + x.getName) + streams.value.log.info("workbench: Refreshing " + x.getName) server.value send Json.arr("run", f.head.getAbsolutePath, bootSnippet.value) f }(Set(x)) @@ -91,7 +92,7 @@ package object workbench extends sbt.Plugin { val outputFile = (crossTarget in Compile).value / fileName.value IO.write(outputFile, transformed) Set(outputFile) - }(Set(new File(getClass.getClassLoader.getResource("workbench_template.ts").getPath))).head + }(Set(new File(getClass.getClassLoader.getResource("workbench_template.ts").toURI))).head } ) diff --git a/project/Build.scala b/project/Build.scala index d1a8350..af554b6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,7 +8,7 @@ object Build extends sbt.Build { override lazy val projects = Seq(root) lazy val root = Project("scala-js-workbench", file(".")) - .dependsOn(uri("../WebSockets")) + .dependsOn(uri("git://github.com/lihaoyi/SprayWebSockets.git")) .settings( sbtPlugin := true, (resources in Compile) := {(resources in Compile).value ++ (baseDirectory.value * "*.ts").get}, |