luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-06 09:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use full form of -classpath option

Browse Source 
short form `-cp` isn't always honored (e.g., javadoc)
This commit is contained in:
Indrajit Raychaudhuri
2011-11-04 13:40:59 -04:00
committed by Mark Harrah
parent b154468097
commit 66500ea776
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compile/CompilerArguments.scala
+1 -1
View File
@@ -18,7 +18,7 @@ final class CompilerArguments(scalaInstance: ScalaInstance, cp: ClasspathOptions
{
checkScalaHomeUnset()
val cpWithCompiler = finishClasspath(classpath)
val classpathOption = Seq("-cp", if(cpWithCompiler.isEmpty) "" else absString(cpWithCompiler) )
val classpathOption = Seq("-classpath", if(cpWithCompiler.isEmpty) "" else absString(cpWithCompiler) )
val outputOption = Seq("-d", outputDirectory.getAbsolutePath)
options ++ outputOption ++ bootClasspathOption ++ classpathOption ++ abs(sources)
}
run/Run.scala
+1 -1
View File
@@ -28,7 +28,7 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
val exitCode = try process.exitValue() catch { case e: InterruptedException => cancel() }
processExitCode(exitCode, "runner")
}
private def classpathOption(classpath: Seq[File]) = "-cp" :: Path.makeString(classpath) :: Nil
private def classpathOption(classpath: Seq[File]) = "-classpath" :: Path.makeString(classpath) :: Nil
private def processExitCode(exitCode: Int, label: String) =
{
if(exitCode == 0)