Changed schema for JSON test to be defined in a .proto file. (#54)

* Changed schema for JSON test to be defined in a .proto file.

Before we had lots of code to build these schemas manually,
but this was verbose and made it difficult to add to the
schema easily.  Now we can just write a .proto file and
adding fields is easy.

To avoid making the tests depend on upbc (and thus Lua)
we check in the generated schema.

* Made protobuf-compiler a dependency of "make genfiles."

* For genfiles download recent protoc that can handle proto3.

* Only use new protoc for genfiles.

1 files changed, 6 insertions, 0 deletions

diff --git a/travis.sh b/travis.sh
index 0b7d48a..02fede8 100755
--- a/travis.sh
+++ b/travis.sh
@@ -73,6 +73,12 @@ lua_script() {
 genfiles_install() {
   sudo apt-get update -qq
   sudo apt-get install lua5.2 liblua5.2-dev
+
+  # Need a recent version of protoc to compile proto3 files.
+  wget https://github.com/google/protobuf/releases/download/v3.0.0-beta-2/protoc-3.0.0-beta-2-linux-x86_64.zip
+  unzip protoc-3.0.0-beta-2-linux-x86_64.zip
+  export PATH=.:$PATH
+  protoc --version || true
 }
 genfiles_script() {
   # Avoid regenerating descriptor.pb, since its output can vary based on the