From 1f6f1ea0dab58eb19fa0aa41d907ac6340b97008 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 10 Jun 2011 08:08:32 -0400 Subject: [PATCH] fixup --- README.md | 10 +++++++--- project/Sbt.scala | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 29f0c60eb..3cffcab63 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ There is a [video of a demo] given at the [Northeast Scala Symposium] that gives # Build from source -To build from source, get the latest stable version of sbt (above) and get the code. +To build from source, get the latest stable version of sbt 0.10.x (see [Setup]) and get the code. $ git clone git://github.com/harrah/xsbt.git $ cd xsbt @@ -25,9 +25,13 @@ The latest tag for 0.10.x is 0.10.0: $ git checkout v0.10.0 -To build: +To build the launcher, publish all components locally, and build API and SXR documentation: - $ sbt update proguard publish-local + $ sbt build-all + +The individual commands are + + $ sbt publish-local proguard sxr doc Copy your stable ~/bin/sbt script to ~/bin/xsbt and change it to use the launcher at: diff --git a/project/Sbt.scala b/project/Sbt.scala index 01a6f08ad..bac5b4c5f 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -171,7 +171,7 @@ object Sbt extends Build in.copy(config = in.config.copy(sources = srcs, classpath = cp.files)) }, publishAll <<= state flatMap { s => nop dependsOn( Defaults.inAllProjects(nonRoots, publishLocal.task, Project.extract(s).structure.data) : _*) }, - TaskKey[Unit]("build-all") <<= (publishAll, sxr, doc) map { (_,_,_) => () } + TaskKey[Unit]("build-all") <<= (publishAll, proguard in Proguard, sxr, doc) map { (_,_,_,_) => () } ) def docSetting = inConfig(Compile)(inTask(sxr)(doc in ThisScope.copy(task = Global, config = Global) <<= Defaults.docTask))