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

move to 2.9.0-1, bump to 0.9.9

This commit is contained in:
Mark Harrah 2011-05-28 23:49:17 -04:00
parent fb60ba1e11
commit 9002720933
9 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -22,9 +22,9 @@ To build from source, get the latest stable version of sbt (above) and get the c
The '-n' option is strictly only necessary when using msysgit on Windows.
(This works around an issue with spaces in the 'master' branch by not checking the 'master' branch out initially.)
The latest tag for 0.9.x is 0.9.8:
The latest tag for 0.9.x is 0.9.9:
$ git checkout v0.9.8
$ git checkout v0.9.9
Or, get the development branch for 0.9.x:
@ -36,8 +36,8 @@ To build:
Copy your stable ~/bin/sbt script to ~/bin/xsbt and change it to use the launcher at:
<xsbt>/target/sbt-launch-0.9.8.jar
<xsbt>/target/sbt-launch-0.9.9.jar
If using the 0.9 development branch, the launcher is at:
<xsbt>/target/sbt-launch-0.9.9-SNAPSHOT.jar
<xsbt>/target/sbt-launch-0.9.10-SNAPSHOT.jar

2
compile/Eval.scala
View File

@ -114,7 +114,7 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
Nil,
List(Nil),
TypeTree(),
Block(List(Apply(Select(Super(emptyTypeName, emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
Block(List(Apply(Select(Super(This(emptyTypeName), emptyTypeName), nme.CONSTRUCTOR), Nil)), Literal(Constant(())))
)
def method = DefDef(NoMods, WrapValName, Nil, Nil, tpt, tree)

4
launch/src/main/resources/sbt/sbt.boot.properties
View File

@ -1,10 +1,10 @@
[scala]
version: 2.8.1
version: 2.9.0-1
[app]
org: org.scala-tools.sbt
name: sbt
version: read(sbt.version)[0.9.9-SNAPSHOT]
version: read(sbt.version)[0.9.9]
class: ${sbt.main.class-sbt.xMain}
components: xsbti
cross-versioned: true

4
project/build.properties
View File

@ -1,5 +1,5 @@
project.organization=org.scala-tools.sbt
project.name=xsbt
sbt.version=0.7.7
project.version=0.9.9-SNAPSHOT
build.scala.versions=2.8.1
project.version=0.9.9
build.scala.versions=2.9.0-1

4
project/build/Sxr.scala
View File

@ -3,7 +3,7 @@ import sbt._
trait Sxr extends BasicScalaProject
{
val sxrConf = config("sxr") hide
val sxrDep = "org.scala-tools.sxr" %% "sxr" % "0.2.7" % sxrConf.name jar()
val sxrDep = "org.scala-tools.sxr" % "sxr_2.9.0" % "0.2.7" % sxrConf.name jar()
def deepSources: PathFinder
def deepBaseDirectories: PathFinder
@ -12,7 +12,7 @@ trait Sxr extends BasicScalaProject
def sxrDirName = "browse"
def sxrOutput = outputPath / (sxrDirName + ".sxr")
def sxrClassesOutput = outputPath / sxrDirName // isn't actually written to, since compiler stops before writing classes
def sxrOptions = compileOptions.map(_.asString) ++ Seq(sxrBaseDirs, sxrLocation, "-Ystop:superaccessors")
def sxrOptions = compileOptions.map(_.asString) ++ Seq(sxrBaseDirs, sxrLocation)
lazy val sxr = task {
xsbt.FileUtilities.delete(sxrOutput +++ sxrClassesOutput getFiles)

8
project/build/XSbt.scala
View File

@ -147,8 +147,8 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
}
trait TestDependencies extends Project
{
val sc = "org.scala-tools.testing" % "scalacheck_2.8.1" % "1.8" % "test"
val sp = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.7.2" % "test"
val sc = "org.scala-tools.testing" % "scalacheck_2.9.0" % "1.8" % "test"
val sp = "org.scala-tools.testing" % "specs_2.9.0" % "1.6.8" % "test"
}
class LogProject(info: ProjectInfo) extends Base(info) with TestDependencies
{
@ -164,7 +164,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
{
// these compilation options are useful for debugging caches and task composition
//override def compileOptions = super.compileOptions ++ List(Unchecked,ExplainTypes, CompileOption("-Xlog-implicits"))
val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.0"
val sbinary = "org.scala-tools.sbinary" % "sbinary_2.9.0" % "0.4.0"
}
class Base(info: ProjectInfo) extends DefaultProject(info) with ManagedBase with Component with Licensed
{
@ -271,7 +271,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
// sub projects for each version of Scala to precompile against other than the one sbt is built against
// each sub project here will add ~100k to the download
lazy val precompiled29 = precompiledSub("2.9.0")
lazy val precompiled29 = precompiledSub("2.8.1")
lazy val precompiled28 = precompiledSub("2.8.0")
lazy val precompiled27 = precompiledSub("2.7.7")

8
tasks/src/test/scala/DemoTask.scala
View File

@ -44,7 +44,7 @@ trait ForkTask[S, CC[_]]
trait JoinTask[S, CC[_]]
{
def join: Task[CC[S]]
def reduce(f: (S,S) => S): Task[S]
def reduced(f: (S,S) => S): Task[S]
}
object Task
{
@ -65,7 +65,7 @@ object Task
def join: Task[Seq[S]] = new Join(in, (s: Seq[S]) => Right(s) )
//def join[T](f: Iterable[S] => T): Task[Iterable[T]] = new MapAll( MList.fromTCList[Task](in), ml => f(ml.toList))
//def joinR[T](f: Iterable[Result[S]] => T): Task[Iterable[Result[T]]] = new Mapped( MList.fromTCList[Task](in), ml => f(ml.toList))
def reduce(f: (S,S) => S): Task[S] = Task.reduce(in.toIndexedSeq, f)
def reduced(f: (S,S) => S): Task[S] = Task.reduced(in.toIndexedSeq, f)
}
@ -148,7 +148,7 @@ object Task
case Inc(i) => throw i
}
def reduce[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] =
def reduced[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] =
i match
{
case Seq() => error("Cannot reduce empty sequence")
@ -156,7 +156,7 @@ object Task
case Seq(x, y) => reducePair(x, y, f)
case z =>
val (a, b) = i.splitAt(i.size / 2)
reducePair( reduce(a, f), reduce(b, f), f )
reducePair( reduced(a, f), reduced(b, f), f )
}
def reducePair[S](a: Task[S], b: Task[S], f: (S, S) => S): Task[S] =
(a :^: b :^: KNil) mapH { case x :+: y :+: HNil => f(x,y) }

4
tasks/src/test/scala/TaskRunnerFork.scala
View File

@ -15,7 +15,7 @@ object TaskRunnerForkTest extends Properties("TaskRunner Fork")
}
property("Fork and reduce 2") = forAll(MaxTasksGen, MaxWorkersGen) { (m: Int, workers: Int) =>
(m > 1) ==> {
val task = (0 to m) fork {_ * 10} reduce{_ + _}
val task = (0 to m) fork {_ * 10} reduced{_ + _}
checkResult(tryRun(task, false, workers), 5*(m+1)*m)
}
}
@ -31,7 +31,7 @@ object TaskRunnerForkTest extends Properties("TaskRunner Fork")
property("fork and reduce") = forAll(TaskListGen, MaxWorkersGen) { (m: List[Int], workers: Int) =>
(!m.isEmpty) ==> {
val expected = m.reduceLeft(_+_)
checkResult(tryRun( m.reduce(_ + _), false, workers), expected)
checkResult(tryRun( m.reduced(_ + _), false, workers), expected)
}
}
}

9
tasks/standard/TaskExtra.scala
View File

@ -45,7 +45,8 @@ sealed trait ForkTask[S, CC[_]]
sealed trait JoinTask[S, CC[_]]
{
def join: Task[CC[S]]
def reduce(f: (S,S) => S): Task[S]
// had to rename from 'reduce' for 2.9.0
def reduced(f: (S,S) => S): Task[S]
}
sealed trait BinaryPipe
@ -97,7 +98,7 @@ trait TaskExtra
final implicit def joinAnyTasks(in: Seq[Task[_]]): JoinTask[Any, Seq] = joinTasks[Any](in map (x => x: Task[Any]))
final implicit def joinTasks[S](in: Seq[Task[S]]): JoinTask[S, Seq] = new JoinTask[S, Seq] {
def join: Task[Seq[S]] = new Join(in, (s: Seq[Result[S]]) => Right(TaskExtra.all(s)) )
def reduce(f: (S,S) => S): Task[S] = TaskExtra.reduce(in.toIndexedSeq, f)
def reduced(f: (S,S) => S): Task[S] = TaskExtra.reduced(in.toIndexedSeq, f)
}
import TaskExtra.{allM, anyFailM, failM, successM}
@ -186,7 +187,7 @@ object TaskExtra extends TaskExtra
def transfer(id: String) = (in: InputStream) => BasicIO.transferFully(in, s.binary(id))
new ProcessIO(BasicIO.ignoreOut, transfer(s.outID), transfer(s.errorID))
}
def reduce[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] =
def reduced[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] =
i match
{
case Seq() => error("Cannot reduce empty sequence")
@ -194,7 +195,7 @@ object TaskExtra extends TaskExtra
case Seq(x, y) => reducePair(x, y, f)
case z =>
val (a, b) = i.splitAt(i.size / 2)
reducePair( reduce(a, f), reduce(b, f), f )
reducePair( reduced(a, f), reduced(b, f), f )
}
def reducePair[S](a: Task[S], b: Task[S], f: (S, S) => S): Task[S] =
(a :^: b :^: KNil) map { case x :+: y :+: HNil => f(x,y) }