aboutsummaryrefslogtreecommitdiff
path: root/stage1
diff options
context:
space:
mode:
Diffstat (limited to 'stage1')
-rw-r--r--stage1/Stage1.scala4
-rw-r--r--stage1/cbt.scala1
2 files changed, 3 insertions, 2 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index 62cab87..c243cc0 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -92,8 +92,8 @@ object Stage1{
val stage2sourceFiles = (
stage2.listFiles
- ++ (stage2 / "plugins").listFiles
- ++ (cbtHome / "libraries" / "eval").listFiles
+ ++ (stage2 / "plugins").listOrFail
+ ++ (cbtHome / "libraries" / "eval").listOrFail
).filter(_.isFile).filter(_.toString.endsWith(".scala"))
val cls = this.getClass.getClassLoader.loadClass("cbt.NailgunLauncher")
diff --git a/stage1/cbt.scala b/stage1/cbt.scala
index b97ad44..8cba9df 100644
--- a/stage1/cbt.scala
+++ b/stage1/cbt.scala
@@ -62,6 +62,7 @@ object `package`{
file.delete
}
+ def listOrFail: Seq[File] = Option( file.listFiles ).getOrElse( throw new Exception( "no such file: " + file ) ).toVector
def listRecursive: Seq[File] = {
file +: (
if( file.isDirectory ) file.listFiles.flatMap(_.listRecursive).toVector else Seq[File]()