Merge pull request #2688 from dotty-staging/fix/default-project-name

Remove default project names, fixing weird dirs crashing dotty-doc
scala · Jun 5, 2017 · fa9f8b2 · fa9f8b2
2 parents a082b9c + 43065e1
commit fa9f8b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -121,7 +121,7 @@ class ScalaSettings extends Settings.SettingGroup {
     "-project",
     "project title",
     "The name of the project",
-    sys.props("user.dir").split(File.separatorChar).last
+    ""
   )
 
   val projectVersion = StringSetting (

diff --git a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala
@@ -48,7 +48,9 @@ class DocDriver extends Driver {
     val projectVersion = ctx.settings.projectVersion.value
     val projectUrl = ctx.settings.projectUrl.value
 
-    if (!siteRoot.exists || !siteRoot.isDirectory)
+    if (projectName.isEmpty)
+      ctx.error(s"Site project name not set. Use `-project <title>` to set the project name")
+    else if (!siteRoot.exists || !siteRoot.isDirectory)
       ctx.error(s"Site root does not exist: $siteRoot")
     else {
       Site(siteRoot, projectName, projectVersion, projectUrl, ctx.docbase.packages)