From 7119c1adbede3787dd617f58320b3d1a2634a2ed Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 4 Feb 2010 18:57:29 -0500 Subject: [PATCH] Exclude launcher jar from unmanaged classpath, allowing it to be put in the lib/ or project root directories. --- src/main/scala/sbt/BasicProjectTypes.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala index 578190eab..bc1644bfa 100644 --- a/src/main/scala/sbt/BasicProjectTypes.scala +++ b/src/main/scala/sbt/BasicProjectTypes.scala @@ -43,12 +43,14 @@ trait UnmanagedClasspathProject extends ClasspathProject /** The classpath containing all jars in the unmanaged directory. */ def unmanagedClasspath: PathFinder = { - val base = descendents(dependencyPath, "*.jar") + val base = descendents(dependencyPath, jarFilter) if(scratch) - base +++ (info.projectPath * "*.jar") + base +++ (info.projectPath * jarFilter) else base } + /* Explicitly filter (x)sbt-launch(er)-.jar, since it contains minified versions of various classes.*/ + private def jarFilter: NameFilter = "*.jar" - "*sbt-launch*.jar" /** The classpath containing all unmanaged classpath elements for the given configuration. This typically includes * at least 'unmanagedClasspath'.*/ def fullUnmanagedClasspath(config: Configuration): PathFinder