diff options
author | Raphael Jolly <rjolly@users.sourceforge.net> | 2013-03-09 22:02:02 +0100 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-11 22:36:17 -0700 |
commit | 3a30af154e62f5b8a569486b09788c42db2103a6 (patch) | |
tree | 4f43fbca95a1f9d59e7307826497b36039328006 /src/compiler/scala/tools/util/PathResolver.scala | |
parent | 3e8f8ddb2ac057ad82e1a7e37f59baff1c0e15ac (diff) | |
download | scala-3a30af154e62f5b8a569486b09788c42db2103a6.tar.gz scala-3a30af154e62f5b8a569486b09788c42db2103a6.tar.bz2 scala-3a30af154e62f5b8a569486b09788c42db2103a6.zip |
SI-874 actual JSR-223 implementation
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
-rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index 9f1d0317be..d8e545e6b1 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -170,6 +170,7 @@ class PathResolver(settings: Settings, context: JavaContext) { object Calculated { def scalaHome = Defaults.scalaHome def useJavaClassPath = settings.usejavacp.value || Defaults.useJavaClassPath + def useManifestClassPath= settings.usemanifestcp.value def javaBootClassPath = cmdLineOrElse("javabootclasspath", Defaults.javaBootClassPath) def javaExtDirs = cmdLineOrElse("javaextdirs", Defaults.javaExtDirs) def javaUserClassPath = if (useJavaClassPath) Defaults.javaUserClassPath else "" @@ -209,6 +210,7 @@ class PathResolver(settings: Settings, context: JavaContext) { classesInPath(scalaBootClassPath), // 4. The Scala boot class path. contentsOfDirsInPath(scalaExtDirs), // 5. The Scala extension class path. classesInExpandedPath(userClassPath), // 6. The Scala application class path. + classesInManifest(useManifestClassPath), // 8. The Manifest class path. sourcesInPath(sourcePath) // 7. The Scala source path. ) |