More path fixes

Author: liufengyun

bench/src/main/scala/Benchmarks.scala

@@ -30,8 +30,11 @@ object Bench {
     val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20
     val forks = if (intArgs.length > 2) intArgs(2).toInt else 1
 
+
+    import File.{ separator => sep }
+
     val args2 = args1.map { arg =>
-      if ((arg.endsWith(".scala") || arg.endsWith(".java")) && arg.head != '/') "../" + arg
+      if ((arg.endsWith(".scala") || arg.endsWith(".java")) && !(new File(arg)).isAbsolute) ".." + sep + arg
       else arg
     }
     storeCompileOptions(args2)
@@ -61,9 +64,10 @@ object Bench {
     val libs = if (args.contains("-with-compiler")) compiler_libs else standard_libs
     var argsNorm = args.filter(_ != "-with-compiler")
 
+    import File.{ pathSeparator => sep }
     var cpIndex = argsNorm.indexOf("-classpath")
     if (cpIndex == -1) cpIndex = argsNorm.indexOf("-cp")
-    if (cpIndex != -1) argsNorm(cpIndex + 1) = argsNorm(cpIndex + 1) + java.io.File.pathSeparator + libs
+    if (cpIndex != -1) argsNorm(cpIndex + 1) = argsNorm(cpIndex + 1) + sep + libs
     else argsNorm = argsNorm :+ "-classpath" :+ libs
 
     val file = new File(COMPILE_OPTS_FILE)

compiler/src/dotty/tools/dotc/consumetasty/ConsumeTasty.scala

@@ -17,7 +17,7 @@ object ConsumeTasty {
     }
 
     val currentClasspath = QuoteDriver.currentClasspath
-    val sep = java.io.File.pathSeparator
+    import java.io.File.{  pathSeparator => sep }
     val args = "-from-tasty" +: "-classpath" +: s"$classpath$sep$currentClasspath" +: classes
     (new Consume).process(args.toArray)
   }

doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala

@@ -8,6 +8,7 @@ import java.io.{ File => JFile, OutputStreamWriter, BufferedWriter, ByteArrayInp
 import java.util.{ List => JList, Arrays }
 import java.nio.file.Path
 import java.nio.charset.StandardCharsets
+import java.io.File.{ separator => sep }
 
 import com.vladsch.flexmark.parser.ParserEmulationProfile
 import com.vladsch.flexmark.parser.Parser
@@ -164,8 +165,8 @@ case class Site(
   private def defaultParams(pageLocation: JFile, additionalDepth: Int = 0): DefaultParams = {
     val pathFromRoot = stripRoot(pageLocation)
     val baseUrl: String = {
-      val rootLen = root.getAbsolutePath.split('/').length
-      val assetLen = pageLocation.getAbsolutePath.split('/').length
+      val rootLen = root.getAbsolutePath.split(sep).length
+      val assetLen = pageLocation.getAbsolutePath.split(sep).length
       "../" * (assetLen - rootLen - 1 + additionalDepth) + "."
     }
 
@@ -195,12 +196,12 @@ case class Site(
         // Suffix is index.html for packages and therefore the additional depth
         // is increased by 1
         val (suffix, offset) =
-          if (e.kind == "package") ("/index.html", -1)
+          if (e.kind == "package") (sep + "index.html", -1)
           else (".html", 0)
 
-        val target = mkdirs(fs.getPath(outDir.getAbsolutePath +  "/api/" + e.path.mkString("/") + suffix))
+        val target = mkdirs(fs.getPath(outDir.getAbsolutePath +  sep + "api" + sep + e.path.mkString(sep) + suffix))
         val params = defaultParams(target.toFile, -1).withPosts(blogInfo).withEntity(Some(e)).toMap
-        val page = new HtmlPage("_layouts/api-page.html", layouts("api-page").content, params, includes)
+        val page = new HtmlPage("_layouts" + sep + "api-page.html", layouts("api-page").content, params, includes)
 
         render(page).foreach { rendered =>
           val source = new ByteArrayInputStream(rendered.getBytes(StandardCharsets.UTF_8))
@@ -217,9 +218,9 @@ case class Site(
       }
 
       // generate search page:
-      val target = mkdirs(fs.getPath(outDir.getAbsolutePath +  "/api/search.html"))
+      val target = mkdirs(fs.getPath(outDir.getAbsolutePath + sep + "api" + sep + "search.html"))
       val searchPageParams = defaultParams(target.toFile, -1).withPosts(blogInfo).toMap
-      val searchPage = new HtmlPage("_layouts/search.html", layouts("search").content, searchPageParams, includes)
+      val searchPage = new HtmlPage("_layouts" + sep + "search.html", layouts("search").content, searchPageParams, includes)
       render(searchPage).foreach { rendered =>
         Files.copy(
           new ByteArrayInputStream(rendered.getBytes(StandardCharsets.UTF_8)),
@@ -230,7 +231,7 @@ case class Site(
     }
 
   /** Generate HTML files from markdown and .html sources */
-  def generateHtmlFiles(outDir: JFile = new JFile(root.getAbsolutePath + "/_site"))(implicit ctx: Context): this.type =
+  def generateHtmlFiles(outDir: JFile = new JFile(root.getAbsolutePath + sep + "_site"))(implicit ctx: Context): this.type =
     createOutput(outDir) {
       compilableFiles.foreach { asset =>
         val pathFromRoot = stripRoot(asset)
@@ -250,7 +251,7 @@ case class Site(
     }
 
   /** Generate blog from files in `blog/_posts` and output in `outDir` */
-  def generateBlog(outDir: JFile = new JFile(root.getAbsolutePath + "/_site"))(implicit ctx: Context): this.type =
+  def generateBlog(outDir: JFile = new JFile(root.getAbsolutePath + sep + "_site"))(implicit ctx: Context): this.type =
     createOutput(outDir) {
       blogposts.foreach { file =>
         val BlogPost.extract(year, month, day, name, ext) = file.getName

project/Build.scala

@@ -623,7 +623,7 @@ object Build {
         val args: List[String] = spaceDelimited("<arg>").parsed.toList
         val attList = (dependencyClasspath in Runtime).value
         val jars = packageAll.value
-        val sep = File.pathSeparator
+        import File.{  pathSeparator => sep }
 
         val scalaLib = findLib(attList, "scala-library")
         val dottyLib = jars("dotty-library")