From 3c434637c5f8dc0e33ce3e685603320cc3060d3e Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Fri, 9 May 2014 22:05:40 -0400
Subject: [PATCH] baby steps

---
 Makefile                     |  8 ++++++--
 src/compiler/capnpc-java.c++ | 15 ++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 13a32bc..ffc083e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ CXX=g++ -std=c++11
 
 CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++
 
-.PHONY: all clean
+.PHONY: all clean addressbook
 
-all : capnpc-java
+all : capnpc-java addressbook
 
 
 clean :
@@ -12,3 +12,7 @@ clean :
 
 capnpc-java : $(CAPNPC_JAVA_SOURCES)
 	$(CXX) -I/usr/local/include -L/usr/local/lib -lkj -lcapnp $(CAPNPC_JAVA_SOURCES) -o capnpc-java
+
+
+addressbook : capnpc-java
+	capnp compile -o ./capnpc-java examples/addressbook.capnp
diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++
index 0a9aade..7f2d0ba 100644
--- a/src/compiler/capnpc-java.c++
+++ b/src/compiler/capnpc-java.c++
@@ -1165,7 +1165,7 @@ private:
           "  struct ", name, ";\n"),
 
       kj::strTree(
-          "struct ", fullName, " {\n",
+          "class ", fullName, " {\n",
           "  ", name, "() = delete;\n"
           "\n"
           "  class Reader;\n"
@@ -1880,16 +1880,9 @@ private:
           "// Generated by Cap'n Proto compiler, DO NOT EDIT\n"
           "// source: ", baseName(displayName), "\n"
           "\n"
-          "#ifndef CAPNP_INCLUDED_", kj::hex(node.getId()), "_\n",
-          "#define CAPNP_INCLUDED_", kj::hex(node.getId()), "_\n"
-          "\n"
-          "#include <capnp/generated-header-support.h>\n",
+          "//#include <capnp/generated-header-support.h>\n",
           hasInterfaces ? kj::strTree("#include <capnp/capability.h>\n") : kj::strTree(),
           "\n"
-          "#if CAPNP_VERSION != ", CAPNP_VERSION, "\n"
-          "#error \"Version mismatch between generated code and library headers.  You must "
-              "use the same version of the Cap'n Proto compiler and library.\"\n"
-          "#endif\n"
           "\n",
           KJ_MAP(path, includes) {
             if (path.startsWith("/")) {
@@ -1999,8 +1992,8 @@ private:
       auto schema = schemaLoader.get(requestedFile.getId());
       auto fileText = makeFileText(schema, requestedFile);
 
-      writeFile(kj::str(schema.getProto().getDisplayName(), ".h"), fileText.header);
-      writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source);
+      writeFile(kj::str(schema.getProto().getDisplayName(), ".java"), fileText.header);
+      //      writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source);
     }
 
     return true;