Update mainline version to 2.4.2-pre.

pull/3335/head
liujisi@google.com 14 years ago
parent 5d99632b2d
commit 5c24564811
  1. 2
      configure.ac
  2. 2
      java/pom.xml
  3. 2
      python/setup.py
  4. 2
      src/google/protobuf/compiler/plugin.pb.h
  5. 2
      src/google/protobuf/descriptor.pb.h
  6. 2
      src/google/protobuf/stubs/common.h

@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release # 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 # 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.) # the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[2.4.1-pre],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[2.4.2-pre],[protobuf@googlegroups.com],[protobuf])
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>2.4.1-pre</version> <version>2.4.2-pre</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Protocol Buffer Java API</name> <name>Protocol Buffer Java API</name>
<description> <description>

@ -118,7 +118,7 @@ if __name__ == '__main__':
libraries = [ "protobuf" ])) libraries = [ "protobuf" ]))
setup(name = 'protobuf', setup(name = 'protobuf',
version = '2.4.1-pre', version = '2.4.2-pre',
packages = [ 'google' ], packages = [ 'google' ],
namespace_packages = [ 'google' ], namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite', test_suite = 'setup.MakeTestSuite',

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #if 2004002 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #if 2004002 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

@ -108,7 +108,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison // The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro // easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 2004001 #define GOOGLE_PROTOBUF_VERSION 2004002
// The minimum library version which works with the current version of the // The minimum library version which works with the current version of the
// headers. // headers.

Loading…
Cancel
Save