From 94db9d983cdd28c053e568b6185fe2494bd7ffec Mon Sep 17 00:00:00 2001
From: Vlad Ureche <vlad.ureche@gmail.com>
Date: Fri, 8 Jun 2012 01:14:17 +0200
Subject: Reverting 22c8dec5 and preventing bootstapping in scaladoc

Review by @dragos, @jsuereth. Required bootstrapping because the starr was
ant tasks were invoking locker with -Ysourcepath instead of -sourcepath.
---
 src/partest/scala/tools/partest/nest/Worker.scala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/partest')

diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 1c2c52263d..48f78e9ddc 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -694,7 +694,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
               // create proper settings for the compiler
               val settings = new Settings(workerError)
               settings.outdir.value = outDir.getAbsoluteFile.getAbsolutePath
-              settings.Ysourcepath.value = sourcepath
+              settings.sourcepath.value = sourcepath
               settings.classpath.value = fileManager.CLASSPATH
               settings.Ybuildmanagerdebug.value = true
 
@@ -712,7 +712,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
                 val args = (line split ' ').toList
                 val command = new CompilerCommand(args, settings)
                 command.ok && {
-                  bM.update(filesToSet(settings.Ysourcepath.value, command.files), Set.empty)
+                  bM.update(filesToSet(settings.sourcepath.value, command.files), Set.empty)
                   !reporter.hasErrors
                 }
               }
@@ -799,7 +799,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
             NestUI.verbose("resFile: "+resFile)
 
             // run compiler in resident mode
-            // $SCALAC -d "$os_dstbase".obj -Xresident -Ysourcepath . "$@"
+            // $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath . "$@"
             val sourcedir  = logFile.getParentFile.getAbsoluteFile
             val sourcepath = sourcedir.getAbsolutePath+File.separator
             NestUI.verbose("sourcepath: "+sourcepath)
@@ -807,7 +807,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
             val argList = List(
               "-d", outDir.getAbsoluteFile.getPath,
               "-Xresident",
-              "-Ysourcepath", sourcepath)
+              "-sourcepath", sourcepath)
 
             // configure input/output files
             val logOut    = new FileOutputStream(logFile)
@@ -817,7 +817,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
 
             // create compiler
             val settings = new Settings(workerError)
-            settings.Ysourcepath.value = sourcepath
+            settings.sourcepath.value = sourcepath
             settings.classpath.value = fileManager.CLASSPATH
             reporter = new ConsoleReporter(settings, scala.Console.in, logConsoleWriter)
             val command = new CompilerCommand(argList, settings)
@@ -828,7 +828,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
               val cmdArgs = (line split ' ').toList map (fs => new File(dir, fs).getAbsolutePath)
               NestUI.verbose("cmdArgs: "+cmdArgs)
               val sett = new Settings(workerError)
-              sett.Ysourcepath.value = sourcepath
+              sett.sourcepath.value = sourcepath
               val command = new CompilerCommand(cmdArgs, sett)
               command.ok && {
                 (new compiler.Run) compile command.files
-- 
cgit v1.2.3