diff options
Diffstat (limited to 'book/src/main/scala/book')
-rw-r--r-- | book/src/main/scala/book/BookData.scala | 5 | ||||
-rw-r--r-- | book/src/main/scala/book/Main.scala | 26 |
2 files changed, 16 insertions, 15 deletions
diff --git a/book/src/main/scala/book/BookData.scala b/book/src/main/scala/book/BookData.scala index b21f660..9fa4d5e 100644 --- a/book/src/main/scala/book/BookData.scala +++ b/book/src/main/scala/book/BookData.scala @@ -4,11 +4,12 @@ import java.io.File import acyclic.file import ammonite.all._ +import ammonite.ops.Path import scalatags.Text.TypedTag import scalatags.Text.all._ object BookData { val wd = processWorkingDir - val cloneRoot = root/System.getProperty("clone.root").split('/') + val cloneRoot = Path(System.getProperty("clone.root")) lazy val javaAPIs = { @@ -25,7 +26,7 @@ object BookData { if file.ext == "scala" } yield{ - val path = (file - cloneRoot).toString.stripSuffix(".scala") + val path = (file - cloneRoot - root).toString.stripSuffix(".scala") val filename = path.replace('/', '.') val docpath = s"https://docs.oracle.com/javase/7/docs/api/$path.html" diff --git a/book/src/main/scala/book/Main.scala b/book/src/main/scala/book/Main.scala index 9696874..1f8521a 100644 --- a/book/src/main/scala/book/Main.scala +++ b/book/src/main/scala/book/Main.scala @@ -31,22 +31,22 @@ object Main { def content = Map("index.html" -> Index()) override def autoResources = super.autoResources ++ Seq( - wd/"META-INF"/'resources/'webjars/'pure/"0.5.0"/"grids-responsive-min.css", - wd/'css/"side-menu.css", - wd/"example-opt.js", - wd/'webpage/"weather.js", - wd/"favicon.svg", - wd/"favicon.png" + root/"META-INF"/'resources/'webjars/'pure/"0.5.0"/"grids-responsive-min.css", + root/'css/"side-menu.css", + root/"example-opt.js", + root/'webpage/"weather.js", + root/"favicon.svg", + root/"favicon.png" ) override def manualResources = super.manualResources ++ Seq( - wd/'images/"javascript-the-good-parts-the-definitive-guide.jpg", - wd/'images/"Hello World.png", - wd/'images/"Hello World White.png", - wd/'images/"Hello World Console.png", - wd/'images/"IntelliJ Hello.png", - wd/'images/"Dropdown.png", - wd/'images/"Scalatags Downloads.png" + root/'images/"javascript-the-good-parts-the-definitive-guide.jpg", + root/'images/"Hello World.png", + root/'images/"Hello World White.png", + root/'images/"Hello World Console.png", + root/'images/"IntelliJ Hello.png", + root/'images/"Dropdown.png", + root/'images/"Scalatags Downloads.png" ) override def headFrags = super.headFrags ++ Seq( meta(charset:="utf-8"), |