From 445f1023e1159212c65cb6c27c4f0a3121248a79 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Thu, 6 Aug 2009 23:01:43 +0000 Subject: Update version number to 2.2.0-pre. --- configure.ac | 6 +++--- java/pom.xml | 2 +- python/setup.py | 2 +- src/Makefile.am | 6 +++--- src/google/protobuf/descriptor.pb.h | 4 ++-- src/google/protobuf/stubs/common.h | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index b847f3da..d160633c 100644 --- a/configure.ac +++ b/configure.ac @@ -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.1.1-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.2.0-pre],[protobuf@googlegroups.com],[protobuf]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) @@ -25,7 +25,7 @@ AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], [CFLAGS=""]) AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], [CXXFLAGS=""]) - + AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -69,7 +69,7 @@ AC_SUBST(PROTOBUF_OPT_FLAG) ACX_CHECK_SUNCC -# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd +# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd # to the link AC_PROG_LIBTOOL diff --git a/java/pom.xml b/java/pom.xml index fc2302a5..13208104 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ com.google.protobuf protobuf-java - 2.1.1-SNAPSHOT + 2.2.0-pre jar Protocol Buffer Java API diff --git a/python/setup.py b/python/setup.py index e8ad11da..c293e686 100755 --- a/python/setup.py +++ b/python/setup.py @@ -105,7 +105,7 @@ if __name__ == '__main__': generate_proto("../src/google/protobuf/descriptor.proto") setup(name = 'protobuf', - version = '2.1.1-SNAPSHOT', + version = '2.2.0-pre', packages = [ 'google' ], namespace_packages = [ 'google' ], test_suite = 'setup.MakeTestSuite', diff --git a/src/Makefile.am b/src/Makefile.am index 5755341a..2c73c278 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ nobase_include_HEADERS = \ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_lite_la_LDFLAGS = -version-info 3:0:0 +libprotobuf_lite_la_LDFLAGS = -version-info 4:0:0 libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/common.cc \ google/protobuf/stubs/once.cc \ @@ -91,7 +91,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 3:0:0 +libprotobuf_la_LDFLAGS = -version-info 4:0:0 libprotobuf_la_SOURCES = \ $(libprotobuf_lite_la_SOURCES) \ google/protobuf/stubs/strutil.cc \ @@ -119,7 +119,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/compiler/parser.cc libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 3:0:0 +libprotoc_la_LDFLAGS = -version-info 4:0:0 libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 782a9efb..bc4ec31d 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -7,12 +7,12 @@ #include -#if GOOGLE_PROTOBUF_VERSION < 2001000 +#if GOOGLE_PROTOBUF_VERSION < 2002000 #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 2001001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2002000 < 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. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 240c804d..964fb6a6 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -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 2001001 +#define GOOGLE_PROTOBUF_VERSION 2002000 // The minimum library version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2001000 +#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2002000 // 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 = 2001000; +static const int kMinHeaderVersionForLibrary = 2002000; // The minimum protoc version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2001000 +#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2002000 // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). -static const int kMinHeaderVersionForProtoc = 2001000; +static const int kMinHeaderVersionForProtoc = 2002000; // Verifies that the headers and libraries are compatible. Use the macro // below to call this. -- cgit v1.2.3