organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Update version number in trunk.

Browse source
This commit is contained in:
kenton@google.com 2009-05-13 23:20:03 +00:00
parent 1d4df6caa4
commit 1fb3d394e5
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.txt
View file

@ -1,4 +1,4 @@
????-??-?? version 2.1.0:
2009-05-13 version 2.1.0:
General
* Repeated fields of primitive types (types other that string, group, and

2
configure.ac
View file

@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[2.0.4-pre],[protobuf@googlegroups.com],[protobuf])
AC_INIT([Protocol Buffers],[2.1.1-pre],[protobuf@googlegroups.com],[protobuf])
# Detect whether the user specified their own compilation flags. If so then
# we want to respect their decision, otherwise we will twiddle them later.

2
java/pom.xml
View file

@ -11,7 +11,7 @@
</parent>-->
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Protocol Buffer Java API</name>
<description>

2
python/setup.py
View file

@ -105,7 +105,7 @@ if __name__ == '__main__':
generate_proto("../src/google/protobuf/descriptor.proto")
setup(name = 'protobuf',
version = '2.0.4-SNAPSHOT',
version = '2.1.1-SNAPSHOT',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',

4
src/google/protobuf/descriptor.pb.h
View file

@ -7,12 +7,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 2000003
#if GOOGLE_PROTOBUF_VERSION < 2001000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 2000004 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 2001001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.

10
src/google/protobuf/stubs/common.h
View file

@ -83,24 +83,24 @@ namespace internal {
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 2000004
#define GOOGLE_PROTOBUF_VERSION 2001001
// The minimum library version which works with the current version of the
// headers.
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2000003
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2001000
// The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code
// generator.
static const int kMinHeaderVersionForLibrary = 2000003;
static const int kMinHeaderVersionForLibrary = 2001000;
// The minimum protoc version which works with the current version of the
// headers.
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2000003
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2001000
// The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion().
static const int kMinHeaderVersionForProtoc = 2000003;
static const int kMinHeaderVersionForProtoc = 2001000;
// Verifies that the headers and libraries are compatible. Use the macro
// below to call this.