diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-16 02:22:01 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-20 22:12:06 -0400 |
commit | 2c20a0dddc70a5eee207fb1c588bfd53eaaa7841 (patch) | |
tree | 8ae901ccafdc509ebb9717b116fdfc4f0244773f /stage1 | |
parent | 450fc5d3defcdc279cfeef0ae622ebe4f90988e2 (diff) | |
download | cbt-2c20a0dddc70a5eee207fb1c588bfd53eaaa7841.tar.gz cbt-2c20a0dddc70a5eee207fb1c588bfd53eaaa7841.tar.bz2 cbt-2c20a0dddc70a5eee207fb1c588bfd53eaaa7841.zip |
merged most bootstrapping logic into launcher
Diffstat (limited to 'stage1')
-rw-r--r-- | stage1/constants.scala | 2 | ||||
-rw-r--r-- | stage1/paths.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stage1/constants.scala b/stage1/constants.scala index a14754e..147e10c 100644 --- a/stage1/constants.scala +++ b/stage1/constants.scala @@ -1,5 +1,5 @@ package cbt object constants{ - val scalaVersion = Option(System.getenv("SCALA_VERSION")).get + val scalaVersion = NailgunLauncher.SCALA_VERSION val scalaMajorVersion = scalaVersion.split("\\.").take(2).mkString(".") } diff --git a/stage1/paths.scala b/stage1/paths.scala index 2006ae8..e8e3cc5 100644 --- a/stage1/paths.scala +++ b/stage1/paths.scala @@ -6,7 +6,7 @@ object paths{ val userHome: File = new File(Option(System.getProperty("user.home")).get) val bootstrapScala: File = cbtHome ++ "/bootstrap_scala" val nailgun: File = new File(Option(System.getenv("NAILGUN")).get) - val stage1: File = new File(Option(System.getenv("STAGE1")).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) |