From f262701b4e48dbd34f3ac988c42bdfd43e47ebcc Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Fri, 10 Oct 2014 10:21:46 -0400 Subject: [PATCH] java_support -> capnp --- Makefile | 2 +- benchmark/src/main/schema/carsales.capnp | 3 +-- benchmark/src/main/schema/catrank.capnp | 3 +-- benchmark/src/main/schema/eval.capnp | 3 +-- .../src/main/{cpp/java_support => schema/capnp}/java.capnp | 0 compiler/src/test/schema/test.capnp | 2 +- examples/src/main/schema/addressbook.capnp | 2 +- project/build.scala | 4 ++-- 8 files changed, 8 insertions(+), 11 deletions(-) rename compiler/src/main/{cpp/java_support => schema/capnp}/java.capnp (100%) diff --git a/Makefile b/Makefile index d15067e..1006aa2 100644 --- a/Makefile +++ b/Makefile @@ -16,4 +16,4 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES) addressbook : capnpc-java PWD=pwd mkdir -p examples/src/main/generated - capnp compile -I$(PWD)/compiler/src/main/cpp --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp + capnp compile -I$(PWD)/compiler/src/main/schema --src-prefix=examples/src/main/schema -o./capnpc-java:examples/src/main/generated examples/src/main/schema/addressbook.capnp diff --git a/benchmark/src/main/schema/carsales.capnp b/benchmark/src/main/schema/carsales.capnp index 9dc3454..79b951e 100644 --- a/benchmark/src/main/schema/carsales.capnp +++ b/benchmark/src/main/schema/carsales.capnp @@ -22,11 +22,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using Cxx = import "/capnp/c++.capnp"; +using Java = import "/capnp/java.capnp"; @0xff75ddc6a36723c9; $Cxx.namespace("capnp::benchmark::capnp"); - -using Java = import "/java_support/java.capnp"; $Java.package("org.capnproto.benchmark"); $Java.outerClassname("CarSalesSchema"); diff --git a/benchmark/src/main/schema/catrank.capnp b/benchmark/src/main/schema/catrank.capnp index b833799..44262c7 100644 --- a/benchmark/src/main/schema/catrank.capnp +++ b/benchmark/src/main/schema/catrank.capnp @@ -22,11 +22,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using Cxx = import "/capnp/c++.capnp"; +using Java = import "/capnp/java.capnp"; @0x82beb8e37ff79aba; $Cxx.namespace("capnp::benchmark::capnp"); - -using Java = import "/java_support/java.capnp"; $Java.package("org.capnproto.benchmark"); $Java.outerClassname("CatRankSchema"); diff --git a/benchmark/src/main/schema/eval.capnp b/benchmark/src/main/schema/eval.capnp index bebdcb4..19e9dbe 100644 --- a/benchmark/src/main/schema/eval.capnp +++ b/benchmark/src/main/schema/eval.capnp @@ -22,11 +22,10 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using Cxx = import "/capnp/c++.capnp"; +using Java = import "/capnp/java.capnp"; @0xe12dc4c3e70e9eda; $Cxx.namespace("capnp::benchmark::capnp"); - -using Java = import "/java_support/java.capnp"; $Java.package("org.capnproto.benchmark"); $Java.outerClassname("EvalSchema"); diff --git a/compiler/src/main/cpp/java_support/java.capnp b/compiler/src/main/schema/capnp/java.capnp similarity index 100% rename from compiler/src/main/cpp/java_support/java.capnp rename to compiler/src/main/schema/capnp/java.capnp diff --git a/compiler/src/test/schema/test.capnp b/compiler/src/test/schema/test.capnp index fb3666e..28146c1 100644 --- a/compiler/src/test/schema/test.capnp +++ b/compiler/src/test/schema/test.capnp @@ -1,6 +1,6 @@ @0xd6eccba9557a7f51; -using Java = import "/java_support/java.capnp"; +using Java = import "/capnp/java.capnp"; $Java.package("org.capnproto.test"); $Java.outerClassname("Test"); diff --git a/examples/src/main/schema/addressbook.capnp b/examples/src/main/schema/addressbook.capnp index b8b3a76..9af2dff 100644 --- a/examples/src/main/schema/addressbook.capnp +++ b/examples/src/main/schema/addressbook.capnp @@ -26,7 +26,7 @@ using Cxx = import "/capnp/c++.capnp"; $Cxx.namespace("addressbook"); -using Java = import "/java_support/java.capnp"; +using Java = import "/capnp/java.capnp"; $Java.package("org.capnproto.examples"); $Java.outerClassname("Addressbook"); diff --git a/project/build.scala b/project/build.scala index 50a7768..5dbd2c5 100644 --- a/project/build.scala +++ b/project/build.scala @@ -62,7 +62,7 @@ object Build extends sbt.Build { val compileTestSchema = taskKey[Unit]("Run capnpc-java on test schema") val compileTestSchemaTask = compileTestSchema := { val result0 = "mkdir -p compiler/src/test/generated".!! - val result = "capnp compile -I compiler/src/main/cpp/ --src-prefix=compiler/src/test/schema/ -o./capnpc-java:compiler/src/test/generated compiler/src/test/schema/test.capnp".!! + val result = "capnp compile -I compiler/src/main/schema/ --src-prefix=compiler/src/test/schema/ -o./capnpc-java:compiler/src/test/generated compiler/src/test/schema/test.capnp".!! println(s"**** CodeGen for test.capnp started\n$result\n**** CodeGen complete."); } @@ -82,7 +82,7 @@ object Build extends sbt.Build { val compileBenchmarkSchema = taskKey[Unit]("Run capnpc-java on benchmark schema") val compileBenchmarkSchemaTask = compileBenchmarkSchema := { val result0 = "mkdir -p benchmark/src/main/generated".!! - val result = "capnp compile -I compiler/src/main/cpp/ --src-prefix=benchmark/src/main/schema/ -o./capnpc-java:benchmark/src/main/generated benchmark/src/main/schema/eval.capnp benchmark/src/main/schema/carsales.capnp benchmark/src/main/schema/catrank.capnp".!! + val result = "capnp compile -I compiler/src/main/schema/ --src-prefix=benchmark/src/main/schema/ -o./capnpc-java:benchmark/src/main/generated benchmark/src/main/schema/eval.capnp benchmark/src/main/schema/carsales.capnp benchmark/src/main/schema/catrank.capnp".!! println(s"**** CodeGen for benchmark started\n$result\n**** CodeGen complete."); }