From 07e9d370a9ef4bf5ff98307b990ada6ad9cee8ff Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Sat, 10 Aug 2013 13:58:08 -0700 Subject: [PATCH] Upgrade for 0.2 version of capnproto C++ library --- README.md | 2 +- capnp/capnp.pyx | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 154c40f..d8b4696 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You can clone the repo like so: ## Requirements -First you need a system-wide installation of the Capnproto C++ library. All you need to do is follow the official [installation docs](http://kentonv.github.io/capnproto/install.html)]. +First you need a system-wide installation of the Capnproto C++ library >= 0.2. All you need to do is follow the official [installation docs](http://kentonv.github.io/capnproto/install.html)]. Also on my ubuntu 12.10 box, I had to run `sudo ldconfig` after installation to make sure the libcapnp library was picked up by the linker. You also need a working version of the latest [Cython](http://cython.org/) and the latest version of setuptools. This is easily done with: diff --git a/capnp/capnp.pyx b/capnp/capnp.pyx index 1eb41af..5e518e0 100644 --- a/capnp/capnp.pyx +++ b/capnp/capnp.pyx @@ -564,7 +564,7 @@ def _load(module, node, loader, name): return local_module def load(file_name, cat_path='/bin/cat'): - p = subprocess.Popen(['capnpc', '-o'+cat_path, file_name], stdout=subprocess.PIPE) + p = subprocess.Popen(['capnp', 'compile', '-o'+cat_path, file_name], stdout=subprocess.PIPE) retcode = p.wait() if retcode != 0: raise RuntimeError("capnpc failed for some reason. Make sure `capnpc` is in your path, and that the path to cat (%s) is correct" % cat_path) diff --git a/setup.py b/setup.py index 438ca88..f0d4773 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from distutils.core import setup import os MAJOR = 0 -MINOR = 1 +MINOR = 2 MICRO = 0 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)