diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | project/build/SparkProject.scala | 18 | ||||
| -rw-r--r-- | project/plugins/SparkProjectPlugins.scala | 5 | ||||
| -rw-r--r-- | project/plugins/project/build.properties | 2 |
4 files changed, 20 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 486011dff5..34fd71d3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *~ *.swp +*.iml +.idea/ /build/ work/ .DS_Store diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index 94345ca8de..bf4294cb3e 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -3,13 +3,16 @@ import de.element34.sbteclipsify._ import sbt.Process._ -class SparkProject(info: ProjectInfo) extends ParentProject(info) +class SparkProject(info: ProjectInfo) +extends ParentProject(info) with IdeaProject { lazy val core = project("core", "Spark Core", new CoreProject(_)) - lazy val examples = project("examples", "Spark Examples", core) + lazy val examples = + project("examples", "Spark Examples", new ExamplesProject(_), core) - class CoreProject(info: ProjectInfo) extends DefaultProject(info) with Eclipsify + class CoreProject(info: ProjectInfo) + extends DefaultProject(info) with Eclipsify with IdeaProject { val TARGET = path("target") / "scala_2.8.1" @@ -30,7 +33,7 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) val makeTarget = " ../../../target/scala_2.8.1/native/" + NATIVE_LIB (("make -C " + NATIVE_DIR + " " + makeTarget) ! log) None - } dependsOn(compile) describedAs("Compiles native library.") + }.dependsOn(compile).describedAs("Compiles native library.") lazy val testReport = task { log.info("Creating " + TEST_REPORT_DIR + "...") @@ -47,6 +50,11 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) process ! None - } dependsOn(compile, testCompile) describedAs("Generate XML test report.") + }.dependsOn(compile, testCompile).describedAs("Generate XML test report.") + } + + class ExamplesProject(info: ProjectInfo) + extends DefaultProject(info) with Eclipsify with IdeaProject + { } } diff --git a/project/plugins/SparkProjectPlugins.scala b/project/plugins/SparkProjectPlugins.scala index e8c2dd7d94..a7786bbdf4 100644 --- a/project/plugins/SparkProjectPlugins.scala +++ b/project/plugins/SparkProjectPlugins.scala @@ -1,5 +1,8 @@ import sbt._ class SparkProjectPlugins(info: ProjectInfo) extends PluginDefinition(info) { - lazy val eclipse = "de.element34" % "sbt-eclipsify" % "0.7.0" + val eclipse = "de.element34" % "sbt-eclipsify" % "0.7.0" + + val sbtIdeaRepo = "sbt-idea-repo" at "http://mpeltonen.github.com/maven/" + val sbtIdea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.2.0" } diff --git a/project/plugins/project/build.properties b/project/plugins/project/build.properties index 1e72d25e5a..62283ba3b2 100644 --- a/project/plugins/project/build.properties +++ b/project/plugins/project/build.properties @@ -1,3 +1,3 @@ #Project properties -#Tue Feb 01 14:51:09 PST 2011 +#Tue Feb 01 23:56:56 PST 2011 plugin.uptodate=true |