diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-26 07:11:18 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-26 07:11:18 -0700 |
| commit | 41073f8db662906ada4b779f199ea6d5f4bd5e1f (patch) | |
| tree | 0dbee4c8a3bb7e0835a51ea7d3358a411f227b24 /src/repl | |
| parent | 970c245a3e96cb52167428bef80d7e772876bd12 (diff) | |
| parent | 85272095b1a862cd0987f74354966cfc6fd2033b (diff) | |
| download | scala-41073f8db662906ada4b779f199ea6d5f4bd5e1f.tar.gz scala-41073f8db662906ada4b779f199ea6d5f4bd5e1f.tar.bz2 scala-41073f8db662906ada4b779f199ea6d5f4bd5e1f.zip | |
Merge pull request #2584 from som-snytt/issue/repl-tools-jar
SI-7410 REPL uses improved tools.jar locator
Diffstat (limited to 'src/repl')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index f4e06f6bfc..9f841f2c44 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -255,16 +255,8 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) } } - private def findToolsJar() = { - val jdkPath = Directory(jdkHome) - val jar = jdkPath / "lib" / "tools.jar" toFile + private def findToolsJar() = PathResolver.SupplementalLocations.platformTools - if (jar isFile) - Some(jar) - else if (jdkPath.isDirectory) - jdkPath.deepFiles find (_.name == "tools.jar") - else None - } private def addToolsJarToLoader() = { val cl = findToolsJar() match { case Some(tools) => ScalaClassLoader.fromURLs(Seq(tools.toURL), intp.classLoader) |