Boost version number to 2.4.0-pre, add more test cases for text_format.py about unicode field.
This commit is contained in:
liujisi@google.com
parent
9b7f6c544a
commit
6f2c3b8734
@ -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.3.1-pre],[protobuf@googlegroups.com],[protobuf])
|
||||
AC_INIT([Protocol Buffers],[2.4.0-pre],[protobuf@googlegroups.com],[protobuf])
|
||||
|
||||
|
||||
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
</parent>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>2.3.1-pre</version>
|
||||
<version>2.4.0-pre</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Protocol Buffer Java API</name>
|
||||
<description>
|
||||
|
||||
@ -189,7 +189,16 @@ class TextFormatTest(unittest.TestCase):
|
||||
message.repeated_string.append('\000\001\a\b\f\n\r\t\v\\\'"')
|
||||
message.repeated_string.append(u'\u00fc\ua71f')
|
||||
|
||||
wire_text = text_format.MessageToString(message, as_one_line=True)
|
||||
# Test as_utf8 = False.
|
||||
wire_text = text_format.MessageToString(
|
||||
message, as_one_line=True, as_utf8=False)
|
||||
parsed_message = unittest_pb2.TestAllTypes()
|
||||
text_format.Merge(wire_text, parsed_message)
|
||||
self.assertEquals(message, parsed_message)
|
||||
|
||||
# Test as_utf8 = True.
|
||||
wire_text = text_format.MessageToString(
|
||||
message, as_one_line=True, as_utf8=True)
|
||||
parsed_message = unittest_pb2.TestAllTypes()
|
||||
text_format.Merge(wire_text, parsed_message)
|
||||
self.assertEquals(message, parsed_message)
|
||||
@ -197,9 +206,11 @@ class TextFormatTest(unittest.TestCase):
|
||||
def testPrintRawUtf8String(self):
|
||||
message = unittest_pb2.TestAllTypes()
|
||||
message.repeated_string.append(u'\u00fc\ua71f')
|
||||
self.CompareToGoldenText(
|
||||
text_format.MessageToString(message, as_utf8 = True),
|
||||
'repeated_string: "\303\274\352\234\237"\n')
|
||||
text = text_format.MessageToString(message, as_utf8 = True)
|
||||
self.CompareToGoldenText(text, 'repeated_string: "\303\274\352\234\237"\n')
|
||||
parsed_message = unittest_pb2.TestAllTypes()
|
||||
text_format.Merge(text, parsed_message)
|
||||
self.assertEquals(message, parsed_message)
|
||||
|
||||
def testMessageToString(self):
|
||||
message = unittest_pb2.ForeignMessage()
|
||||
|
||||
@ -77,7 +77,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 6:0:0 -export-dynamic -no-undefined
|
||||
libprotobuf_lite_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
|
||||
libprotobuf_lite_la_SOURCES = \
|
||||
google/protobuf/stubs/common.cc \
|
||||
google/protobuf/stubs/once.cc \
|
||||
@ -95,7 +95,7 @@ libprotobuf_lite_la_SOURCES = \
|
||||
google/protobuf/io/zero_copy_stream_impl_lite.cc
|
||||
|
||||
libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
|
||||
libprotobuf_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined
|
||||
libprotobuf_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
|
||||
libprotobuf_la_SOURCES = \
|
||||
$(libprotobuf_lite_la_SOURCES) \
|
||||
google/protobuf/stubs/strutil.cc \
|
||||
@ -123,7 +123,7 @@ libprotobuf_la_SOURCES = \
|
||||
google/protobuf/compiler/parser.cc
|
||||
|
||||
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
|
||||
libprotoc_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined
|
||||
libprotoc_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
|
||||
libprotoc_la_SOURCES = \
|
||||
google/protobuf/compiler/code_generator.cc \
|
||||
google/protobuf/compiler/command_line_interface.cc \
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
|
||||
#if GOOGLE_PROTOBUF_VERSION < 2003000
|
||||
#if GOOGLE_PROTOBUF_VERSION < 2004000
|
||||
#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 2003001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 2004000 < 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.
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
|
||||
#if GOOGLE_PROTOBUF_VERSION < 2003000
|
||||
#if GOOGLE_PROTOBUF_VERSION < 2004000
|
||||
#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 2003001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
|
||||
#if 2004000 < 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.
|
||||
|
||||
@ -108,24 +108,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 2003001
|
||||
#define GOOGLE_PROTOBUF_VERSION 2004000
|
||||
|
||||
// The minimum library version which works with the current version of the
|
||||
// headers.
|
||||
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2003000
|
||||
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 2004000
|
||||
|
||||
// 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 = 2003000;
|
||||
static const int kMinHeaderVersionForLibrary = 2004000;
|
||||
|
||||
// The minimum protoc version which works with the current version of the
|
||||
// headers.
|
||||
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2003000
|
||||
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 2004000
|
||||
|
||||
// The minimum header version which works with the current version of
|
||||
// protoc. This constant should only be used in VerifyVersion().
|
||||
static const int kMinHeaderVersionForProtoc = 2003000;
|
||||
static const int kMinHeaderVersionForProtoc = 2004000;
|
||||
|
||||
// Verifies that the headers and libraries are compatible. Use the macro
|
||||
// below to call this.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user