Commit 0a35b416 authored by Kenton Varda's avatar Kenton Varda

Merge pull request #264 from joliss/cleanup

Minor cleanup
parents 2cbd458a f976a7bb
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
# setup-ekam.sh # setup-ekam.sh
/c++/.ekam /c++/.ekam
# super-test.sh
/tmp-staging
# Jekyll-generated site # Jekyll-generated site
/doc/_site /doc/_site
......
...@@ -492,7 +492,7 @@ struct Return { ...@@ -492,7 +492,7 @@ struct Return {
# must not send separate `Release` messages for them. Level 0 implementations in particular # must not send separate `Release` messages for them. Level 0 implementations in particular
# should always set this true. This defaults true because if level 0 implementations forget to # should always set this true. This defaults true because if level 0 implementations forget to
# set it they'll never notice (just silently leak caps), but if level >=1 implementations forget # set it they'll never notice (just silently leak caps), but if level >=1 implementations forget
# set it false they'll quickly get errors. # to set it to false they'll quickly get errors.
union { union {
results @2 :Payload; results @2 :Payload;
......
...@@ -108,13 +108,10 @@ Note: These packages are not maintained by us and are sometimes not up to date w ...@@ -108,13 +108,10 @@ Note: These packages are not maintained by us and are sometimes not up to date w
If you download directly from Git, you will need to have the GNU autotools -- If you download directly from Git, you will need to have the GNU autotools --
[autoconf](http://www.gnu.org/software/autoconf/), [autoconf](http://www.gnu.org/software/autoconf/),
[automake](http://www.gnu.org/software/automake/), and [automake](http://www.gnu.org/software/automake/), and
[libtool](http://www.gnu.org/software/libtool/) -- installed. You will also need Subversion [libtool](http://www.gnu.org/software/libtool/) -- installed.
installed (in addition to Git) in order to fetch the Google Test sources (done by
`setup-autotools.sh`).
git clone https://github.com/sandstorm-io/capnproto.git git clone https://github.com/sandstorm-io/capnproto.git
cd capnproto/c++ cd capnproto/c++
./setup-autotools.sh
autoreconf -i autoreconf -i
./configure ./configure
make -j6 check make -j6 check
......
...@@ -62,7 +62,6 @@ build_packages() { ...@@ -62,7 +62,6 @@ build_packages() {
echo "Building C++ package..." echo "Building C++ package..."
echo "=========================================================================" echo "========================================================================="
cd c++ cd c++
doit ./setup-autotools.sh | tr = -
doit autoreconf -i doit autoreconf -i
doit ./configure doit ./configure
doit make -j6 distcheck doit make -j6 distcheck
......
...@@ -241,7 +241,6 @@ else ...@@ -241,7 +241,6 @@ else
fi fi
cd c++ cd c++
doit ./setup-autotools.sh | tr = -
doit autoreconf -i doit autoreconf -i
doit ./configure --prefix="$STAGING" doit ./configure --prefix="$STAGING"
doit make -j6 check doit make -j6 check
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment