diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-14 23:29:09 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-19 21:13:49 -0400 |
| commit | a5f4db210aa2878eb8e15a6d9fe5235199d4aee6 (patch) | |
| tree | 62ee3ddd75578f340a6c36f99188fae413585b4e /stage1/paths.scala | |
| parent | 35a96fea9336dfcac8aac75824450cbf7dc4ae1a (diff) | |
| download | cbt-a5f4db210aa2878eb8e15a6d9fe5235199d4aee6.tar.gz cbt-a5f4db210aa2878eb8e15a6d9fe5235199d4aee6.tar.bz2 cbt-a5f4db210aa2878eb8e15a6d9fe5235199d4aee6.zip | |
replace two level classloader with hierarchy
replace two level classloader (one for non-cachable dependencies with a cached parent one for cachable ones) with a hierachy of classloaders corresponding
this should eventually allow re-using CBT's classloader between stage1 and stage2
this change breaks the ScalaTest support for now
Diffstat (limited to 'stage1/paths.scala')
| -rw-r--r-- | stage1/paths.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stage1/paths.scala b/stage1/paths.scala index d3856c8..2006ae8 100644 --- a/stage1/paths.scala +++ b/stage1/paths.scala @@ -4,9 +4,10 @@ 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 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 stage2: File = cbtHome ++ "/stage2" - val nailgun: File = new File(Option(System.getenv("NAILGUN")).get) private val target = Option(System.getenv("TARGET")).get.stripSuffix("/") val stage1Target: File = stage1 ++ ("/" ++ target) val stage2Target: File = stage2 ++ ("/" ++ target) |