Skip to content
This repository has been archived by the owner on Oct 13, 2020. It is now read-only.

Commit

Permalink
1.2.1 release (actual)
Browse files Browse the repository at this point in the history
Supersedes canceled release at fe05e3f.

Signed-off-by: A. Jesse Jiryu Davis <[email protected]>
  • Loading branch information
ajdavis committed Oct 29, 2015
1 parent 36ed7a9 commit 6e2a07d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 17 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")

set (BSON_MAJOR_VERSION 1)
set (BSON_MINOR_VERSION 2)
set (BSON_MICRO_VERSION 2)
set (BSON_PRERELEASE_VERSION dev)
set (BSON_MICRO_VERSION 1)
set (BSON_PRERELEASE_VERSION )
set (BSON_API_VERSION 1.0)
set (BSON_VERSION 1.2.2-dev)
set (BSON_VERSION 1.2.1)

set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
set (CPACK_PACKAGE_VERSION_MAJOR ${BSON_MAJOR_VERSION})
Expand Down
4 changes: 2 additions & 2 deletions build/autotools/Versions.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
m4_define([bson_major_version], [1])
m4_define([bson_minor_version], [2])
m4_define([bson_micro_version], [2])
m4_define([bson_prerelease_version], [dev])
m4_define([bson_micro_version], [1])
m4_define([bson_prerelease_version], [])

m4_define(
[bson_version],
Expand Down
7 changes: 5 additions & 2 deletions build/rpm/libbson.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Name: libbson
Version: 1.2.0
Version: 1.2.1
Release: 1%{?dist}
Summary: BSON library

License: ASL 2.0
URL: https://github.com/mongodb/libbson
Source0: https://github.com/mongodb/libbson/releases/download/1.2.0-beta/libbson-1.2.0-beta.tar.gz
Source0: https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
BuildRequires: automake

%description
Expand Down Expand Up @@ -53,6 +53,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

%changelog

* Thu October 29 2015 A. Jesse Jiryu Davis <[email protected]> - 1.2.1-1
- Release 1.2.1

* Tue October 13 2015 A. Jesse Jiryu Davis <[email protected]> - 1.2.0-1
- Release 1.2.0

Expand Down
16 changes: 8 additions & 8 deletions doc/installing.page
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
<section id="unix-build">
<title>Building from a release tarball</title>
<p>Unless you intend on contributing to libbson, you will want to build from a release tarball.</p>
<p>The most recent release of libbson is 1.2.0 and can be <link href="https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz">downloaded here</link>. The following snippet will download and extract the code, and configure it:</p>
<p>The most recent release of libbson is 1.2.1 and can be <link href="https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz">downloaded here</link>. The following snippet will download and extract the code, and configure it:</p>

<screen>
$ wget https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz
$ tar xzf libbson-1.2.0.tar.gz
$ cd libbson-1.2.0
$ wget https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
$ tar xzf libbson-1.2.1.tar.gz
$ cd libbson-1.2.1
$ ./configure</screen>
<p>If <code>configure</code> completed successfully, you'll see something like the following describing your build configuration.</p>
<screen>libbson was configured with the following options:
Expand Down Expand Up @@ -116,9 +116,9 @@ $ make man html</screen>
<title>Building on OS X</title>
<p>Download the latest release tarball:</p>
<screen>
$ curl -LO https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz
$ tar xzf libbson-1.2.0.tar.gz
$ cd libbson-1.2.0</screen>
$ curl -LO https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
$ tar xzf libbson-1.2.1.tar.gz
$ cd libbson-1.2.1</screen>
<p>Build and install the library:</p>
<screen>
$ ./configure
Expand All @@ -142,7 +142,7 @@ $ make man html</screen>

<p>Let's start by generating Visual Studio project files for libbson. The following assumes we are compiling for 64-bit Windows using Visual Studio 2010 Express which can be freely downloaded from Microsoft.</p>

<screen><output style="prompt">&gt; </output><input>cd libbson-1.2.0</input>
<screen><output style="prompt">&gt; </output><input>cd libbson-1.2.1</input>
<output style="prompt">&gt; </output><input>cmake -G "Visual Studio 2010 Win64" "-DCMAKE_INSTALL_PREFIX=C:\libbson"</input>
<output style="prompt">&gt; </output><input>msbuild.exe ALL_BUILD.vcxproj</input>
<output style="prompt">&gt; </output><input>msbuild.exe INSTALL.vcxproj</input></screen>
Expand Down
4 changes: 2 additions & 2 deletions doc/version.page
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#define BSON_MAJOR_VERSION (1)
#define BSON_MINOR_VERSION (2)
#define BSON_MICRO_VERSION (0)
#define BSON_VERSION_S "1.2.0"
#define BSON_MICRO_VERSION (1)
#define BSON_VERSION_S "1.2.1"
#define BSON_VERSION_HEX (BSON_MAJOR_VERSION << 24 | \
BSON_MINOR_VERSION << 16 | \
Expand Down

0 comments on commit 6e2a07d

Please sign in to comment.