From 89fcd96702d6aa963192f0221922d2702820048f Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Sat, 13 Nov 2010 22:07:08 -0800
Subject: Initial work to get Spark compiling with SBT 0.7.5 RC0

---
 run | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'run')

diff --git a/run b/run
index b3748e78ab..f68042e129 100755
--- a/run
+++ b/run
@@ -25,7 +25,7 @@ fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
 JAVA_OPTS="$SPARK_JAVA_OPTS"
-JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/third_party:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
+JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/lib:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
 JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM"
 # Load extra JAVA_OPTS from conf/java-opts, if it exists
 if [ -e $FWDIR/conf/java-opts ] ; then
@@ -34,21 +34,21 @@ fi
 export JAVA_OPTS
 
 # build up classpath
-CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/classes:$FWDIR/target/test/classes:$MESOS_CLASSPATH"
+CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/scala_2.8.1/classes:$MESOS_CLASSPATH"
 CLASSPATH+=:$FWDIR/conf
-CLASSPATH+=:$FWDIR/third_party/mesos.jar
-CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar
-CLASSPATH+=:$FWDIR/third_party/colt.jar
-CLASSPATH+=:$FWDIR/third_party/guava-r07/guava-r07.jar
-CLASSPATH+=:$FWDIR/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar
-CLASSPATH+=:$FWDIR/third_party/scalatest-1.2/scalatest-1.2.jar
-CLASSPATH+=:$FWDIR/third_party/scalacheck_2.8.0-1.7.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar
-CLASSPATH+=:$FWDIR/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar
-CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar
-CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
-for jar in $FWDIR/third_party/hadoop-0.20.0/lib/*.jar; do
+CLASSPATH+=:$FWDIR/lib/mesos.jar
+CLASSPATH+=:$FWDIR/lib/asm-3.2/lib/all/asm-all-3.2.jar
+CLASSPATH+=:$FWDIR/lib/colt.jar
+CLASSPATH+=:$FWDIR/lib/guava-r07/guava-r07.jar
+CLASSPATH+=:$FWDIR/lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
+CLASSPATH+=:$FWDIR/lib/scalatest-1.2/scalatest-1.2.jar
+CLASSPATH+=:$FWDIR/lib/scalacheck_2.8.0-1.7.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar
+CLASSPATH+=:$FWDIR/lib/apache-log4j-1.2.16/log4j-1.2.16.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
+for jar in $FWDIR/lib/hadoop-0.20.0/lib/*.jar; do
   CLASSPATH+=:$jar
 done
 export CLASSPATH # Needed for spark-shell
-- 
cgit v1.2.3