Merge pull request #2 from arosenberger/master

Add `make` as a compile task in the generator project, remove capnpc-jav...

.gitignore

@@ -4,3 +4,5 @@ project/target
 .idea
 *.ipr
 *.iws
+capnpc-java
+generated/

Makefile

@@ -5,11 +5,10 @@ CAPNPC_JAVA_SOURCES=generator/src/main/cpp/compiler/capnpc-java.c++
 
 .PHONY: all clean addressbook
 
-all : capnpc-java addressbook
+all : capnpc-java
 
 clean :
 	rm capnpc-java
-	sbt clean
 
 capnpc-java : $(CAPNPC_JAVA_SOURCES)
 	$(CXX) $(CAPNPC_JAVA_SOURCES) $(CXX_FLAGS) -g -o capnpc-java
@@ -18,4 +17,3 @@ addressbook : capnpc-java
 	PWD=pwd
 	mkdir -p examples/src/main/generated
 	capnp compile -I$(PWD)/generator/src/main/cpp/compiler --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp
-	sbt examples/"compile"

project/build.scala

@@ -1,6 +1,5 @@
 import sbt.Keys._
 import sbt._
-import org.sbtidea.SbtIdeaPlugin._
 
 object Build extends sbt.Build {
 
@@ -9,30 +8,25 @@ object Build extends sbt.Build {
       id = "capnproto-java",
       base = file(".")
     ).aggregate(generator, examples)
+      .settings(cleanFiles <+= baseDirectory { base => base / "capnpc-java"})
 
   lazy val generator =
     project(
       id = "generator",
       base = file("generator")
     ).settings(Defaults.itSettings: _*)
-    .settings(compile <<= compile in Compile dependsOn(compile in Test, compile in IntegrationTest))
+      .settings(makeCppTask)
+      .settings(compile <<= compile in Compile dependsOn makeCpp)
 
   lazy val examples =
     project(
       id = "examples",
       base = file("examples")
     ).dependsOn(generator)
+      .settings(makeExamplesTask)
+      .settings(compile <<= compile in Compile dependsOn makeExamples)
       .settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated")
-    .settings(publish := {})
+      .settings(cleanFiles += sourceDirectory.value / "main" / "generated")
-    .settings(publishLocal := {})
-    .settings(fork in run := true)
-    .settings(outputStrategy := Some(StdoutOutput))
-    .settings(javaOptions in run ++= Seq(
-      "-ms2g",
-      "-mx2g",
-      "-XX:+AlwaysPreTouch",
-      "-XX:+TieredCompilation"
-    ))
 
   def project(id: String, base: File) =
     Project(
@@ -43,6 +37,19 @@ object Build extends sbt.Build {
         Shared.settings ++
         Seq(libraryDependencies ++= Shared.testDeps)
     ).configs(IntegrationTest)
+
+  val makeCpp = taskKey[Unit]("Run make against the C++ code to create the Java code generator")
+  val makeCppTask = makeCpp := {
+    val makeResult = "make".!!
+    println(s"**** C++ Build Started\n$makeResult\n**** C++ Build Complete")
+  }
+
+  val makeExamples = taskKey[Unit]("Run capnp-java compiler against the addressbook schema")
+  val makeExamplesTask = makeExamples := {
+    Thread.sleep(1000)
+    val makeResult = "make addressbook".!!
+    println(s"**** CodeGen for Addressbook Started\n$makeResult\n**** CodeGen for Addressbook Complete")
+  }
 }
 
 object Shared {