From 75d5b91b7967b1c65f4d2b4a65d4a87d18b46974 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 12 May 2011 09:26:15 -0400 Subject: [PATCH] use 0.7.7 to build, fix build to not require changing projects --- README.md | 28 +++++++++++++++++++--------- project/build.properties | 2 +- project/build/XSbt.scala | 4 ++-- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 445aaaf56..0a4dc9ba8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,18 @@ -This is the 0.9.x development series of sbt. The current stable release of sbt is 0.7.5, which can be downloaded from the [Google Code project](http://code.google.com/p/simple-build-tool). +[Google Code project]: http://code.google.com/p/simple-build-tool +[Northeast Scala Symposium]: http://www.nescala.org/2011/ +[documentation]: https://github.com/harrah/xsbt/wiki +[Setup]: https://github.com/harrah/xsbt/wiki/Setup.md +[video of a demo]: http://vimeo.com/20263617 -See for setup instructions for the stable version of sbt. +# sbt 0.9 + +This is the 0.9.x development series of sbt. See [Setup] for getting started with the latest binary release or see below to build from source. + +The current stable release of sbt is 0.7.7, which can be downloaded from the [Google Code project]. + +There is a [video of a demo] given at the [Northeast Scala Symposium] that gives a brief introduction to ideas in sbt 0.9. Note that the demo was based on 0.9.0 and things have changed since then. See the [documentation] for current information. + +# Build from source To build from source, get the latest stable version of sbt (above) and get the code. @@ -10,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.4: +The latest tag for 0.9.x is 0.9.5: - $ git checkout v0.9.4 + $ git checkout v0.9.5 Or, get the development branch for 0.9.x: @@ -20,14 +32,12 @@ Or, get the development branch for 0.9.x: To build: - $ sbt update "project Launcher" proguard "project Simple Build Tool" "publish-local" + $ sbt update proguard publish-local Copy your stable ~/bin/sbt script to ~/bin/xsbt and change it to use the launcher at: - /target/sbt-launch-0.9.4.jar + /target/sbt-launch-0.9.5.jar If using the 0.9 development branch, the launcher is at: - /target/sbt-launch-0.9.5-SNAPSHOT.jar - -There is a [video of a demo](http://vimeo.com/20263617) given at the [Northeast Scala Symposium](http://www.nescala.org/2011/) that gives a brief introduction to ideas in sbt 0.9. Note that the demo was based on 0.9.0 and some things have changed since then. See the [documentation](https://github.com/harrah/xsbt/wiki) for current information. \ No newline at end of file + /target/sbt-launch-0.9.6-SNAPSHOT.jar diff --git a/project/build.properties b/project/build.properties index ab78da7c8..ea2c539af 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,5 +1,5 @@ project.organization=org.scala-tools.sbt project.name=xsbt -sbt.version=0.7.5 +sbt.version=0.7.7 project.version=0.9.5-SNAPSHOT build.scala.versions=2.8.1 diff --git a/project/build/XSbt.scala b/project/build/XSbt.scala index 612955cb3..596b7815c 100644 --- a/project/build/XSbt.scala +++ b/project/build/XSbt.scala @@ -239,7 +239,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths { override def componentID = None } - class Scripted(info: ProjectInfo) extends DefaultProject(info) + class Scripted(info: ProjectInfo) extends Base(info) { override def managedStyle = ManagedStyle.Ivy override def scratch = true @@ -269,7 +269,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.RC4") + lazy val precompiled29 = precompiledSub("2.9.0") lazy val precompiled28 = precompiledSub("2.8.0") lazy val precompiled27 = precompiledSub("2.7.7")