From 32eb8a5a1cd08f554835264be4c22c890d516f15 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Sun, 25 May 2014 17:34:57 -0400 Subject: [PATCH] examples/test depends on makeExamples --- Makefile | 2 +- project/build.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4ff0f33..d15067e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CXX_FLAGS=-std=c++11 -stdlib=libc++ `pkg-config capnp --cflags --libs` CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++ -.PHONY: all clean addressbook +.PHONY: all clean all : capnpc-java diff --git a/project/build.scala b/project/build.scala index f1f2c7f..00020aa 100644 --- a/project/build.scala +++ b/project/build.scala @@ -27,8 +27,9 @@ object Build extends sbt.Build { project( id = "examples", base = file("examples") - ).dependsOn(runtime) + ).dependsOn(runtime, compiler) .settings(makeExamplesTask) + .settings(test <<= test in Test dependsOn makeExamples) .settings(compile <<= compile in Compile dependsOn makeExamples) .settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated") .settings(cleanFiles += sourceDirectory.value / "main" / "generated") @@ -45,7 +46,7 @@ object Build extends sbt.Build { val makeCpp = taskKey[Unit]("Run make against the C++ code to create the Java code generator") val makeCppTask = makeCpp := { - val makeResult = "make".!! + val makeResult = "make capnpc-java".!! println(s"**** C++ Build Started\n$makeResult\n**** C++ Build Complete") }