serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

examples/test depends on makeExamples

Browse source
This commit is contained in:
David Renshaw 2014-05-25 17:34:57 -04:00
parent 904faa3a6c
commit 32eb8a5a1c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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++ CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
.PHONY: all clean addressbook .PHONY: all clean
all : capnpc-java all : capnpc-java

5
project/build.scala
View file

@ -27,8 +27,9 @@ object Build extends sbt.Build {
project( project(
id = "examples", id = "examples",
base = file("examples") base = file("examples")
).dependsOn(runtime) ).dependsOn(runtime, compiler)
.settings(makeExamplesTask) .settings(makeExamplesTask)
.settings(test <<= test in Test dependsOn makeExamples)
.settings(compile <<= compile in Compile dependsOn makeExamples) .settings(compile <<= compile in Compile dependsOn makeExamples)
.settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated") .settings(unmanagedSourceDirectories in Compile += sourceDirectory.value / "main" / "generated")
.settings(cleanFiles += 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 makeCpp = taskKey[Unit]("Run make against the C++ code to create the Java code generator")
val makeCppTask = makeCpp := { val makeCppTask = makeCpp := {
val makeResult = "make".!! val makeResult = "make capnpc-java".!!
println(s"**** C++ Build Started\n$makeResult\n**** C++ Build Complete") println(s"**** C++ Build Started\n$makeResult\n**** C++ Build Complete")
} }