luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable building against 2.8.0-SNAPSHOT 

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@925 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-08-02 00:55:46 +00:00
parent 9a816b20d0
commit e7522e5691
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/build/CrossCompileProject.scala
View File

@ -15,7 +15,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
private val version2_7_3 = "2.7.3" private val version2_7_3 = "2.7.3"
private val version2_7_4 = "2.7.4" private val version2_7_4 = "2.7.4"
private val version2_7_5 = "2.7.5" private val version2_7_5 = "2.7.5"
private val version2_8_0 = "2.8.0.r18093-b20090623200909" private val version2_8_0 = "2.8.0-SNAPSHOT"
private val base = "base" private val base = "base"
/* The configurations for the versions of Scala.*/ /* The configurations for the versions of Scala.*/
@ -28,7 +28,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
// the list of all configurations cross-compile supports // the list of all configurations cross-compile supports
private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil
// the list of configurations to actually build against // the list of configurations to actually build against
private val buildConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0 private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0
// the configuration to use for normal development (when cross-building is not done) // the configuration to use for normal development (when cross-building is not done)
private def developmentVersion = buildConfigurations.first private def developmentVersion = buildConfigurations.first
@ -175,6 +175,12 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
private def crossJarName(scalaVersion: Configuration) = sbt(scalaVersion) + "-" + version.toString + ".jar" private def crossJarName(scalaVersion: Configuration) = sbt(scalaVersion) + "-" + version.toString + ".jar"
// This creates a task that compiles sbt against the given version of scala. Classes are put in classes-<scalaVersion>. // This creates a task that compiles sbt against the given version of scala. Classes are put in classes-<scalaVersion>.
private def compileForScala(version: Configuration)= private def compileForScala(version: Configuration)=
{
def filteredSources =
if(version eq conf_2_8_0) // cannot compile against test libraries currently
Path.lazyPathFinder { mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
else
mainSources
task task
{ {
val classes = classesPath(version) val classes = classesPath(version)
@ -188,7 +194,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
// The libraries to compile sbt against // The libraries to compile sbt against
val classpath = fullClasspath(version) +++ optionalClasspath(version) val classpath = fullClasspath(version) +++ optionalClasspath(version)
val sources: List[String] = pathListStrings(mainSources) val sources: List[String] = pathListStrings(filteredSources)
val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString) val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString)
val compilerArguments: List[String] = compilerOptions ::: sources val compilerArguments: List[String] = compilerOptions ::: sources
@ -201,6 +207,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
else else
Some("Nonzero exit value (" + exitValue + ") when calling scalac " + version + " with options: \n" + compilerOptions.mkString(" ")) Some("Nonzero exit value (" + exitValue + ") when calling scalac " + version + " with options: \n" + compilerOptions.mkString(" "))
} }
}
private def concatPaths(p: PathFinder): String = Path.makeString(p.get) private def concatPaths(p: PathFinder): String = Path.makeString(p.get)
private def pathListStrings(p: PathFinder): List[String] = p.get.map(_.absolutePath).toList private def pathListStrings(p: PathFinder): List[String] = p.get.map(_.absolutePath).toList
private def classesPath(scalaVersion: Configuration) = ("target" / ("classes-" + scalaVersion.toString)) ## private def classesPath(scalaVersion: Configuration) = ("target" / ("classes-" + scalaVersion.toString)) ##

5
project/build/SbtProject.scala
View File

@ -26,11 +26,6 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.SbtScripted protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.SbtScripted
{ {
override def mainSources =
if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
Path.lazyPathFinder { super.mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
else
super.mainSources
override def defaultJarBaseName = "sbt_" + version.toString override def defaultJarBaseName = "sbt_" + version.toString
/** Additional resources to include in the produced jar.*/ /** Additional resources to include in the produced jar.*/
def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE" def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"