diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-02-02 00:25:54 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-02-02 00:25:54 -0800 |
| commit | ec28b607fd58489024ea7a6e801a97507036c1b2 (patch) | |
| tree | a891bbc8b806576ad7893279d38483a183a8691d /project | |
| parent | 7f74ee99f68911bcd471f8b428e5c2055d1f95b0 (diff) | |
| parent | 817e7223213b8d4ef8c783acca1345ef03e97f22 (diff) | |
| download | spark-ec28b607fd58489024ea7a6e801a97507036c1b2.tar.gz spark-ec28b607fd58489024ea7a6e801a97507036c1b2.tar.bz2 spark-ec28b607fd58489024ea7a6e801a97507036c1b2.zip | |
Merge branch 'master' into sbt
Conflicts:
Makefile
core/src/main/java/spark/compress/lzf/LZF.java
core/src/main/java/spark/compress/lzf/LZFInputStream.java
core/src/main/java/spark/compress/lzf/LZFOutputStream.java
core/src/main/native/spark_compress_lzf_LZF.c
run
Diffstat (limited to 'project')
| -rw-r--r-- | project/build/SparkProject.scala | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index bf4294cb3e..be4f263891 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -18,23 +18,9 @@ extends ParentProject(info) with IdeaProject val TEST_REPORT_DIR = TARGET / "test-report" - val NATIVE_DIR = path("src") / "main" / "native" - - val NATIVE_SOURCES = NATIVE_DIR * "*.c" - - val NATIVE_LIB = { - if (System.getProperty("os.name") == "Mac OS X") - "libspark_native.dylib" - else - "libspark_native.so" - } - - lazy val native = fileTask(TARGET / NATIVE_LIB from NATIVE_SOURCES) { - val makeTarget = " ../../../target/scala_2.8.1/native/" + NATIVE_LIB - (("make -C " + NATIVE_DIR + " " + makeTarget) ! log) - None - }.dependsOn(compile).describedAs("Compiles native library.") - + // Create an XML test report using ScalaTest's -u option. Unfortunately + // there is currently no way to call this directly from SBT without + // executing a subprocess. lazy val testReport = task { log.info("Creating " + TEST_REPORT_DIR + "...") if (!TEST_REPORT_DIR.exists) { |