Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed unused code, per @hubertp's comments.

  • Loading branch information...
commit aad11f0a0131e57334792020e8dfddb4e16c391b 1 parent 3b61e04
@dragos dragos authored
View
12 ...sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/EclipseSbtBuildManager.scala
@@ -95,18 +95,6 @@ class EclipseSbtBuildManager(val project: ScalaProject, settings0: Settings)
val pendingSources = new mutable.HashSet[IFile]
- /** Filter the classpath. Return the original classpath without the Scala library jar.
- * The second element of the tuple contains the Scala library jar.
- */
- private def filterOutScalaLibrary(l: Seq[IPath]): (Seq[IPath], Option[IPath]) = {
- val jars = l.partition(p => p.lastSegment() == ScalaCompilerConf.LIBRARY_SUFFIX)
-
- // make sure the library file exists on disk. You can have several scala-library.jar entries in
- // the classpath, coming from MANIFEST.MF (ClassPath: entry) expansion of other jars.
- // Such jars may not exist on disk, though.
- (jars._2, jars._1.find(p => p.lastSegment() == ScalaCompilerConf.LIBRARY_SUFFIX && p.toFile().exists()))
- }
-
lazy val scalaVersion = {
// For the moment fixed to 2.9.0
ScalaPlugin.plugin.scalaVer
View
16 org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/SbtConf.scala
@@ -18,9 +18,6 @@ import sbt.ClasspathOptions
* a classloader used to instantiate the Scala compiler.
*/
object ScalaCompilerConf {
- final val LIBRARY_SUFFIX = "scala-library.jar"
- final val COMPILER_SUFFIX = "scala-compiler.jar"
-
final val CACHE_SUFFIX = ".cache"
private val _bootdir = (new File("")).getAbsoluteFile
@@ -42,24 +39,11 @@ object ScalaCompilerConf {
ScalaInstance(version, libraryJar, compilerJar, launcher, extraJar)
}
- def apply(version: String, eclipsePluginDir: File): ScalaInstance = {
- val launcher = Launcher(_bootdir, Nil)
- val libraryJar = findJar(eclipsePluginDir, LIBRARY_SUFFIX, version)
- val compilerJar = findJar(eclipsePluginDir, COMPILER_SUFFIX, version)
- //val libraryJar = ScalaPlugin.plugin.sbtScalaLib
- //val compilerJar = ScalaPlugin.plugin.sbtScalaCompiler
- ScalaInstance(libraryJar, compilerJar, launcher)
- }
-
def deployedInstance(): ScalaInstance = {
val launcher = Launcher(_bootdir, Nil)
ScalaInstance(ScalaPlugin.plugin.libClasses.get.toFile, ScalaPlugin.plugin.compilerClasses.get.toFile, launcher)
}
- private def findJar(dir: File, prefix: String, version: String): File = {
- new File(dir, prefix + version + ".jar")
- }
-
def cacheLocation(project: IProject): IFile =
project.getFile(CACHE_SUFFIX)
}
Please sign in to comment.
Something went wrong with that request. Please try again.