From b8ff4ca3d51ec61c27473630ba09d2330bb1324a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 28 Jun 2013 12:07:23 -0400
Subject: [PATCH] conscript launchconfigs for 0.13.0-SNAPSHOT

---
 src/main/conscript/sbt/launchconfig    | 22 +++++++++++++++-------
 src/main/conscript/scalas/launchconfig | 23 +++++++++++++++++------
 src/main/conscript/screpl/launchconfig | 23 +++++++++++++++++------
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig
index 98c510937..707d24f98 100644
--- a/src/main/conscript/sbt/launchconfig
+++ b/src/main/conscript/sbt/launchconfig
@@ -1,18 +1,26 @@
 [scala]
-  version: auto
+  version: ${sbt.scala.version-auto}
 
 [app]
-  org: org.scala-sbt
+  org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: read(sbt.version)[0.13.0-Beta2]
-  class: ${sbt.main.class-sbt.xMain}
-  components: xsbti
-  cross-versioned: true
+  version: ${sbt.version-read(sbt.version)[0.13.0-SNAPSHOT]}
+  class: sbt.xMain
+  components: xsbti,extra
+  cross-versioned: ${sbt.cross.versioned-false}
+  resources: ${sbt.extraClasspath-}
 
 [repositories]
   local
-  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
 
+[boot]
+ directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
+
 [ivy]
   ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/}
+  checksums: ${sbt.checksums-sha1,md5}
+  override-build-repos: ${sbt.override.build.repos-false}
+  repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}
diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig
index ff1c65bb8..d217c2218 100644
--- a/src/main/conscript/scalas/launchconfig
+++ b/src/main/conscript/scalas/launchconfig
@@ -1,15 +1,26 @@
 [scala]
-  version: auto
+  version: ${sbt.scala.version-auto}
 
 [app]
-  org: org.scala-sbt
+  org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: 0.13.0-Beta2
+  version: ${sbt.version-read(sbt.version)[0.13.0-SNAPSHOT]}
   class: sbt.ScriptMain
-  components: xsbti
-  cross-versioned: true
+  components: xsbti,extra
+  cross-versioned: ${sbt.cross.versioned-false}
+  resources: ${sbt.extraClasspath-}
 
 [repositories]
   local
-  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
+
+[boot]
+ directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
+
+[ivy]
+  ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/}
+  checksums: ${sbt.checksums-sha1,md5}
+  override-build-repos: ${sbt.override.build.repos-false}
+  repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}
diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig
index 6044de79a..4807e6ec8 100644
--- a/src/main/conscript/screpl/launchconfig
+++ b/src/main/conscript/screpl/launchconfig
@@ -1,15 +1,26 @@
 [scala]
-  version: auto
+  version: ${sbt.scala.version-auto}
 
 [app]
-  org: org.scala-sbt
+  org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: 0.13.0-Beta2
+  version: ${sbt.version-read(sbt.version)[0.13.0-SNAPSHOT]}
   class: sbt.ConsoleMain
-  components: xsbti
-  cross-versioned: true
+  components: xsbti,extra
+  cross-versioned: ${sbt.cross.versioned-false}
+  resources: ${sbt.extraClasspath-}
 
 [repositories]
   local
-  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
+
+[boot]
+ directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
+
+[ivy]
+  ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/}
+  checksums: ${sbt.checksums-sha1,md5}
+  override-build-repos: ${sbt.override.build.repos-false}
+  repository-config: ${sbt.repository.config-${sbt.global.base-${user.home}/.sbt}/repositories}