From 1474afb68082a13374617d7da9e77af230c170a0 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 11 Jan 2010 21:02:36 -0500 Subject: [PATCH] console-project fix --- src/main/scala/sbt/Run.scala | 3 ++- src/sbt-test/run/console-project/test | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala index 4d8a68ad6..10d3682c1 100644 --- a/src/main/scala/sbt/Run.scala +++ b/src/main/scala/sbt/Run.scala @@ -109,7 +109,8 @@ object Run val projectLoader = project.getClass.getClassLoader val launcherJar = FileUtilities.classLocationFile[xsbti.Launcher] val app = project.info.app - val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar) + val projectJars: Array[File] = projectLoader.asInstanceOf[URLClassLoader].getURLs.flatMap(ClasspathUtilities.asFile).toArray[File] + val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar) ++ projectJars compilerSettings.classpath.value = classpathFiles.map(_.getAbsolutePath).mkString(File.pathSeparator) project.log.debug(" Compiler classpath: " + compilerSettings.classpath.value) diff --git a/src/sbt-test/run/console-project/test b/src/sbt-test/run/console-project/test index 671942e06..4f355b10b 100644 --- a/src/sbt-test/run/console-project/test +++ b/src/sbt-test/run/console-project/test @@ -1 +1,4 @@ +> console-project +$ copy-file changes/BlankProject.scala project/build/BlankProject.scala +> reload > console-project \ No newline at end of file