diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-17 11:21:02 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:32:38 +0100 |
| commit | 4d67243c4b6aea2038b160091088ca0998d7be90 (patch) | |
| tree | 170e344e6582c9f7497e8aa5cdc7afc251699dc8 /doc-tool/src | |
| parent | fb8854ab6b8b3751b797d01efcbea5b4653007b8 (diff) | |
| download | dotty-4d67243c4b6aea2038b160091088ca0998d7be90.tar.gz dotty-4d67243c4b6aea2038b160091088ca0998d7be90.tar.bz2 dotty-4d67243c4b6aea2038b160091088ca0998d7be90.zip | |
Allow custom project name
Diffstat (limited to 'doc-tool/src')
3 files changed, 7 insertions, 6 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala index 228366431..0225b3c5e 100644 --- a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala +++ b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala @@ -62,7 +62,7 @@ class DocDriver extends Driver { if (!siteRoot.exists || !siteRoot.isDirectory) ctx.error(s"Site root does not exist: $siteRoot") else { - Site(siteRoot, docs) + Site(siteRoot, ctx.settings.projectName.value, docs) .generateApiDocs() .copyStaticFiles() .generateHtmlFiles() diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala index bb28b7a54..d64ebcd90 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala @@ -25,14 +25,15 @@ case class DefaultParams( "site" -> Map( "baseurl" -> site.baseurl, - "posts" -> site.posts.map(_.toMap) + "posts" -> site.posts.map(_.toMap), + "project" -> site.projectTitle ).asJava, "entity" -> entity.asJava() ) def withPosts(posts: Array[BlogPost]): DefaultParams = - copy(site = SiteInfo(site.baseurl, posts)) + copy(site = SiteInfo(site.baseurl, site.projectTitle, posts)) def withUrl(url: String): DefaultParams = copy(page = PageInfo(url)) @@ -46,4 +47,4 @@ case class PageInfo(url: String, date: String = "") { val path: Array[String] = url.split('/').reverse.drop(1) } -case class SiteInfo(baseurl: String, posts: Array[BlogPost]) +case class SiteInfo(baseurl: String, projectTitle: String, posts: Array[BlogPost]) diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala index 92fd95d09..0a8cff347 100644 --- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala +++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala @@ -26,7 +26,7 @@ import model.Package import scala.io.Source import scala.collection.mutable.ArrayBuffer -case class Site(val root: JFile, val documentation: Map[String, Package]) extends ResourceFinder { +case class Site(val root: JFile, val projectTitle: String, val documentation: Map[String, Package]) extends ResourceFinder { /** Documentation serialized to java maps */ private val docs: JList[_] = { import model.java._ @@ -122,7 +122,7 @@ case class Site(val root: JFile, val documentation: Map[String, Package]) extend "../" * (assetLen - rootLen - 1 + additionalDepth) + "." } - DefaultParams(docs, PageInfo(pathFromRoot), SiteInfo(baseUrl, Array())) + DefaultParams(docs, PageInfo(pathFromRoot), SiteInfo(baseUrl, projectTitle, Array())) } private def createOutput(outDir: JFile)(op: => Unit): this.type = { |