Rewrite CBT's classloading and dependency classloaders, fetch zinc early and various smaller changes

Rewrite CBT's classloading and dependency classloaders, fetch zinc early and various smaller changes

1 files changed, 4 insertions, 2 deletions

diff --git a/stage1/paths.scala b/stage1/paths.scala
index d3856c8..f27e538 100644
--- a/stage1/paths.scala
+++ b/stage1/paths.scala
@@ -4,12 +4,14 @@ object paths{
   val cbtHome: File = new File(Option(System.getenv("CBT_HOME")).get)
   val mavenCache: File = cbtHome ++ "/cache/maven"
   val userHome: File = new File(Option(System.getProperty("user.home")).get)
-  val stage1: File = new File(Option(System.getenv("STAGE1")).get)
-  val stage2: File = cbtHome ++ "/stage2"
+  val bootstrapScala: File = cbtHome ++ "/bootstrap_scala"
   val nailgun: File = new File(Option(System.getenv("NAILGUN")).get)
+  val stage1: File = new File(NailgunLauncher.STAGE1)
+  val stage2: File = cbtHome ++ "/stage2"
   private val target = Option(System.getenv("TARGET")).get.stripSuffix("/")
   val stage1Target: File = stage1 ++ ("/" ++ target)
   val stage2Target: File = stage2 ++ ("/" ++ target)
+  val stage2StatusFile: File = stage2Target ++ ".last-success"
   val nailgunTarget: File = nailgun ++ ("/" ++ target)
   val sonatypeLogin: File = cbtHome ++ "/sonatype.login"
 }