Skip to content

Commit

Permalink
Set release branch version to 1.0.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
kentonv committed Jan 12, 2024
1 parent 6ce339f commit 1a0e12c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion c++/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6)
project("Cap'n Proto" CXX)
set(VERSION 1.0.2-rc1)
set(VERSION 1.0.2)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

Expand Down
2 changes: 1 addition & 1 deletion c++/configure.ac
@@ -1,6 +1,6 @@
## Process this file with autoconf to produce configure.

AC_INIT([Capn Proto],[1.0.2-rc1],[capnproto@googlegroups.com],[capnproto-c++])
AC_INIT([Capn Proto],[1.0.2],[capnproto@googlegroups.com],[capnproto-c++])

AC_CONFIG_SRCDIR([src/capnp/layout.c++])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
14 changes: 7 additions & 7 deletions doc/install.md
Expand Up @@ -55,9 +55,9 @@ package from [Apple](https://developer.apple.com/downloads/) or compiler builds

You may download and install the release version of Cap'n Proto like so:

<pre><code>curl -O <a href="https://capnproto.org/capnproto-c++-1.0.1.1.tar.gz">https://capnproto.org/capnproto-c++-1.0.1.1.tar.gz</a>
tar zxf capnproto-c++-1.0.1.1.tar.gz
cd capnproto-c++-1.0.1.1
<pre><code>curl -O <a href="https://capnproto.org/capnproto-c++-1.0.2.tar.gz">https://capnproto.org/capnproto-c++-1.0.2.tar.gz</a>
tar zxf capnproto-c++-1.0.2.tar.gz
cd capnproto-c++-1.0.2
./configure
make -j6 check
sudo make install</code></pre>
Expand Down Expand Up @@ -96,15 +96,15 @@ If you download directly from Git, you will need to have the GNU autotools --

1. Download Cap'n Proto Win32 build:

<pre><a href="https://capnproto.org/capnproto-c++-win32-1.0.1.1.zip">https://capnproto.org/capnproto-c++-win32-1.0.1.1.zip</a></pre>
<pre><a href="https://capnproto.org/capnproto-c++-win32-1.0.2.zip">https://capnproto.org/capnproto-c++-win32-1.0.2.zip</a></pre>

2. Find `capnp.exe`, `capnpc-c++.exe`, and `capnpc-capnp.exe` under `capnproto-tools-win32-1.0.1.1` in
2. Find `capnp.exe`, `capnpc-c++.exe`, and `capnpc-capnp.exe` under `capnproto-tools-win32-1.0.2` in
the zip and copy them somewhere.

3. If your `.capnp` files will import any of the `.capnp` files provided by the core project, or
if you use the `stream` keyword (which implicitly imports `capnp/stream.capnp`), then you need
to put those files somewhere where the capnp compiler can find them. To do this, copy the
directory `capnproto-c++-1.0.1.1/src` to the location of your choice, then make sure to pass the
directory `capnproto-c++-1.0.2/src` to the location of your choice, then make sure to pass the
flag `-I <that location>` to `capnp` when you run it.

If you don't care about C++ support, you can stop here. The compiler exe can be used with plugins
Expand All @@ -118,7 +118,7 @@ If you want to use Cap'n Proto in C++ with Visual Studio, do the following:

2. Install [CMake](http://www.cmake.org/) version 3.1 or later.

3. Use CMake to generate Visual Studio project files under `capnproto-c++-1.0.1.1` in the zip file.
3. Use CMake to generate Visual Studio project files under `capnproto-c++-1.0.2` in the zip file.
You can use the CMake UI for this or run this shell command:

cmake -G "Visual Studio 16 2019"
Expand Down

0 comments on commit 1a0e12c

Please sign in to comment.