From 1a0362e888ed04d3dc97611aca4745aeac682716 Mon Sep 17 00:00:00 2001
From: Robey Pointer <robey@twitter.com>
Date: Mon, 28 Feb 2011 12:07:53 -0800
Subject: throw a reasonable error if we can't find scala-compiler or
 scala-library. this can be really hard to puzzle out from the base exception.

---
 libraries/eval/Eval.scala | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'libraries/eval')

diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index 4bd7ac2..41e1241 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -34,8 +34,19 @@ import scala.tools.nsc.util.{BatchSourceFile, Position}
  * Evaluate a file or string and return the result.
  */
 object Eval {
-  private val compilerPath = jarPathOfClass("scala.tools.nsc.Interpreter")
-  private val libPath = jarPathOfClass("scala.ScalaObject")
+  private val compilerPath = try {
+    jarPathOfClass("scala.tools.nsc.Interpreter")
+  } catch {
+    case e =>
+      throw new RuntimeException("Unable lo load scala interpreter from classpath (scala-compiler jar is missing?)", e)
+  }
+
+  private val libPath = try {
+    jarPathOfClass("scala.ScalaObject")
+  } catch {
+    case e =>
+      throw new RuntimeException("Unable to load scala base object from classpath (scala-library jar is missing?)", e)
+  }
 
   private val jvmId = java.lang.Math.abs(new Random().nextInt())
 
-- 
cgit v1.2.3