Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8581 from acozzette/merge-3-16-x

Browse Source 
Merge 3.16.x into master branch
pull/8582/head
Adam Cozzette 4 years ago committed by GitHub
parent 7e3bbeda92 d0c4c409ef
commit 80df7760aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 147 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      CHANGES.txt
  2. 2
      Protobuf-C++.podspec
  3. 2
      Protobuf.podspec
  4. 2
      configure.ac
  5. 2
      csharp/Google.Protobuf.Tools.nuspec
  6. 4
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  7. 2
      java/bom/pom.xml
  8. 2
      java/core/pom.xml
  9. 2
      java/lite/pom.xml
  10. 2
      java/pom.xml
  11. 2
      java/util/pom.xml
  12. 2
      js/package.json
  13. 50
      php/ext/google/protobuf/package.xml
  14. 2
      php/ext/google/protobuf/protobuf.h
  15. 2
      protoc-artifacts/pom.xml
  16. 2
      python/google/protobuf/__init__.py
  17. 2
      ruby/google-protobuf.gemspec
  18. 2
      src/Makefile.am
  19. 4
      src/google/protobuf/any.pb.h
  20. 4
      src/google/protobuf/api.pb.h
  21. 4
      src/google/protobuf/compiler/plugin.pb.h
  22. 4
      src/google/protobuf/descriptor.pb.h
  23. 4
      src/google/protobuf/duration.pb.h
  24. 4
      src/google/protobuf/empty.pb.h
  25. 4
      src/google/protobuf/field_mask.pb.h
  26. 8
      src/google/protobuf/port_def.inc
  27. 4
      src/google/protobuf/source_context.pb.h
  28. 4
      src/google/protobuf/struct.pb.h
  29. 8
      src/google/protobuf/stubs/common.h
  30. 4
      src/google/protobuf/timestamp.pb.h
  31. 4
      src/google/protobuf/type.pb.h
  32. 4
      src/google/protobuf/wrappers.pb.h
  33. 20
      update_version.py

52
CHANGES.txt
Unescape View File

@ -1,4 +1,3 @@
Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
Protocol Compiler Protocol Compiler
@ -30,9 +29,23 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
* Added a conformance test for the case of multiple fields from the same * Added a conformance test for the case of multiple fields from the same
oneof. oneof.
3.16.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) 2021-04-06 version 3.16.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
C++ C++
* Fix compiler warnings issue found in conformance_test_runner #8189 (#8190)
* Fix MinGW-w64 build issues. (#8286)
* [Protoc] C++ Resolved an issue where NO_DESTROY and CONSTINIT are in incorrect order (#8296)
* Fix PROTOBUF_CONSTINIT macro redefinition (#8323)
* Delete StringPiecePod (#8353)
* Fix gcc error: comparison of unsigned expression in '>= 0' is always … (#8309)
* Fix cmake install on iOS (#8301)
* Create a CMake option to control whether or not RTTI is enabled (#8347)
* Fix endian.h location on FreeBSD (#8351)
* Refactor util::Status (#8354)
* Make util::Status more similar to absl::Status (#8405)
* Fix -Wsuggest-destructor-override for generated C++ proto classes. (#8408)
* Refactor StatusOr and StringPiece (#8406)
* Refactor uint128 (#8416)
* The ::pb namespace is no longer exposed due to conflicts. * The ::pb namespace is no longer exposed due to conflicts.
* Allow MessageDifferencer::TreatAsSet() (and friends) to override previous * Allow MessageDifferencer::TreatAsSet() (and friends) to override previous
calls instead of crashing. calls instead of crashing.
@ -57,20 +70,49 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
* util::DefaultFieldComparator will be final in a future version of protobuf. * util::DefaultFieldComparator will be final in a future version of protobuf.
Subclasses should inherit from SimpleFieldComparator instead. Subclasses should inherit from SimpleFieldComparator instead.
Java: C#
* Add .NET 5 target and improve WriteString performance with SIMD (#8147)
Java
* deps: update JUnit and Truth (#8319)
* Detect invalid overflow of byteLimit and return InvalidProtocolBufferException as documented. * Detect invalid overflow of byteLimit and return InvalidProtocolBufferException as documented.
* Exceptions thrown while reading from an InputStream in parseFrom are now * Exceptions thrown while reading from an InputStream in parseFrom are now
included as causes. included as causes.
* Support potentially more efficient proto parsing from RopeByteStrings. * Support potentially more efficient proto parsing from RopeByteStrings.
* Clarify runtime of ByteString.Output.toStringBuffer(). * Clarify runtime of ByteString.Output.toStringBuffer().
* Added UnsafeByteOperations to protobuf-lite (#8426)
JavaScript
* Make Any.pack() chainable.
Python Python
* Fix some constness / char literal issues being found by MSVC standard conforming mode (#8344)
* Switch on "new" buffer API (#8339)
* Enable crosscompiling aarch64 python wheels under dockcross manylinux docker image (#8280)
* Fixed a bug in text format where a trailing colon was printed for repeated field. * Fixed a bug in text format where a trailing colon was printed for repeated field.
* When TextFormat encounters a duplicate message map key, replace the current * When TextFormat encounters a duplicate message map key, replace the current
one instead of merging. one instead of merging.
JavaScript Objective-C
* Make Any.pack() chainable. * Move the class map to a CFDictionary. (#8328)
PHP
* read_property() handler is not supposed to return NULL (#8362)
* Changed parameter type from long to integer (#7613)
* fix: README supported PHP version for C extension (#8236)
Ruby
* Fixed quadratic memory usage when appending to arrays. (#8364)
* Fixed memory leak of Ruby arena objects. (#8461)
* Add support for proto3 json_name in compiler and field definitions. (#8356)
Other
* Some doc on AOT compilation and protobuf (#8294)
* [CMake] Ability to pass options to protoc executable from cmake (#8374)
* Add --fatal_warnings flag to treat warnings as errors (#8131)
* [bazel] Remove deprecated way to depend on googletest (#8396)
* add error returns missing from protoc to prevent it from exiting with… (#8409)
2021-04-07 version 3.15.8 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) 2021-04-07 version 3.15.8 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)

2
Protobuf-C++.podspec
Unescape View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf-C++' s.name = 'Protobuf-C++'
s.version = '3.15.8' s.version = '3.16.0'
s.summary = 'Protocol Buffers v3 runtime library for C++.' s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf' s.homepage = 'https://github.com/google/protobuf'
s.license = '3-Clause BSD License' s.license = '3-Clause BSD License'

2
Protobuf.podspec
Unescape View File

@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library. # dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf' s.name = 'Protobuf'
s.version = '3.15.8' s.version = '3.16.0'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf' s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = '3-Clause BSD License' s.license = '3-Clause BSD License'

2
configure.ac
Unescape View File

@ -17,7 +17,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],[3.15.8],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[3.16.0],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])

2
csharp/Google.Protobuf.Tools.nuspec
Unescape View File

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.15.8</version> <version>3.16.0</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

4
csharp/src/Google.Protobuf/Google.Protobuf.csproj
Unescape View File

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.15.8</VersionPrefix> <VersionPrefix>3.16.0</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence --> <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion> <LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>

2
java/bom/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId> <artifactId>protobuf-bom</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name> <name>Protocol Buffers [BOM]</name>

2
java/core/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
</parent> </parent>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>

2
java/lite/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
</parent> </parent>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>

2
java/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>

2
java/util/pom.xml
Unescape View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>

2
js/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "google-protobuf", "name": "google-protobuf",
"version": "3.15.8", "version": "3.16.0",
"description": "Protocol Buffers for JavaScript", "description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js", "main": "google-protobuf.js",
"files": [ "files": [

50
php/ext/google/protobuf/package.xml
Unescape View File

@ -10,11 +10,11 @@
<email>protobuf-opensource@google.com</email> <email>protobuf-opensource@google.com</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2021-04-07</date> <date>2021-05-05</date>
<time>14:27:08</time> <time>16:34:02</time>
<version> <version>
<release>3.15.8</release> <release>3.16.0</release>
<api>3.15.8</api> <api>3.16.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -22,7 +22,9 @@
</stability> </stability>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
No new changes in 3.15.8 * read_property() handler is not supposed to return NULL (#8362)
* Changed parameter type from long to integer (#7613)
* fix: README supported PHP version for C extension (#8236)
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="/" name="/"> <dir baseinstalldir="/" name="/">
@ -904,15 +906,45 @@ G A release.
</release> </release>
<release> <release>
<version> <version>
<release>3.15.8</release> <release>3.16.0RC1</release>
<api>3.15.8</api> <api>3.16.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2021-04-02</date>
<time>16:11:33</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
<release>
<version>
<release>3.16.0RC2</release>
<api>3.16.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2021-05-03</date>
<time>16:40:57</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
<release>
<version>
<release>3.16.0</release>
<api>3.16.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
<api>stable</api> <api>stable</api>
</stability> </stability>
<date>2021-04-07</date> <date>2021-05-05</date>
<time>14:27:08</time> <time>16:34:02</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
</notes> </notes>

2
php/ext/google/protobuf/protobuf.h
Unescape View File

@ -76,7 +76,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.15.8" #define PHP_PROTOBUF_VERSION "3.16.0"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

2
protoc-artifacts/pom.xml
Unescape View File

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId> <artifactId>protoc</artifactId>
<version>3.15.8</version> <version>3.16.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protobuf Compiler</name> <name>Protobuf Compiler</name>
<description> <description>

2
python/google/protobuf/__init__.py
Unescape View File

@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved. # Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '3.15.8' __version__ = '3.16.0'

2
ruby/google-protobuf.gemspec
Unescape View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.15.8" s.version = "3.16.0"
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
s.licenses = ["BSD-3-Clause"] s.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

2
src/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ else
PTHREAD_DEF = PTHREAD_DEF =
endif endif
PROTOBUF_VERSION = 26:8:0 PROTOBUF_VERSION = 27:0:0
if GCC if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison # Turn on all warnings except for sign comparison (we ignore sign comparison

4
src/google/protobuf/any.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/api.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/duration.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/empty.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/field_mask.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

8
src/google/protobuf/port_def.inc
Unescape View File

@ -107,17 +107,17 @@
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 3015008 #define PROTOBUF_VERSION 3016000
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
#endif #endif
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3015000 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3016000
#ifdef PROTOBUF_MIN_PROTOC_VERSION #ifdef PROTOBUF_MIN_PROTOC_VERSION
#error PROTOBUF_MIN_PROTOC_VERSION was previously defined #error PROTOBUF_MIN_PROTOC_VERSION was previously defined
#endif #endif
#define PROTOBUF_MIN_PROTOC_VERSION 3015000 #define PROTOBUF_MIN_PROTOC_VERSION 3016000
#ifdef PROTOBUF_VERSION_SUFFIX #ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined #error PROTOBUF_VERSION_SUFFIX was previously defined
@ -286,7 +286,7 @@
// 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.
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3015000 #define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3016000
#ifdef PROTOBUF_RTTI #ifdef PROTOBUF_RTTI
#error PROTOBUF_RTTI was previously defined #error PROTOBUF_RTTI was previously defined

4
src/google/protobuf/source_context.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/struct.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

8
src/google/protobuf/stubs/common.h
Unescape View File

@ -82,7 +82,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 3015008 #define GOOGLE_PROTOBUF_VERSION 3016000
// A suffix string for alpha, beta or rc releases. Empty for stable releases. // A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
@ -90,15 +90,15 @@ namespace internal {
// The minimum header version which works with the current version of // The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code // the library. This constant should only be used by protoc's C++ code
// generator. // generator.
static const int kMinHeaderVersionForLibrary = 3015000; static const int kMinHeaderVersionForLibrary = 3016000;
// The minimum protoc version which works with the current version of the // The minimum protoc version which works with the current version of the
// headers. // headers.
#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3015000 #define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3016000
// The minimum header version which works with the current version of // The minimum header version which works with the current version of
// protoc. This constant should only be used in VerifyVersion(). // protoc. This constant should only be used in VerifyVersion().
static const int kMinHeaderVersionForProtoc = 3015000; static const int kMinHeaderVersionForProtoc = 3016000;
// Verifies that the headers and libraries are compatible. Use the macro // Verifies that the headers and libraries are compatible. Use the macro
// below to call this. // below to call this.

4
src/google/protobuf/timestamp.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/type.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

4
src/google/protobuf/wrappers.pb.h
Unescape View File

@ -8,12 +8,12 @@
#include <string> #include <string>
#include <google/protobuf/port_def.inc> #include <google/protobuf/port_def.inc>
#if PROTOBUF_VERSION < 3015000 #if PROTOBUF_VERSION < 3016000
#error This file was generated by a newer version of protoc which is #error This file was generated by a newer version of protoc which is
#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 3015008 < PROTOBUF_MIN_PROTOC_VERSION #if 3016000 < 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.

20
update_version.py
Unescape View File

@ -13,25 +13,25 @@ import sys
from xml.dom import minidom from xml.dom import minidom
if len(sys.argv) < 2 or len(sys.argv) > 3: if len(sys.argv) < 2 or len(sys.argv) > 3:
print """ print("""
[ERROR] Please specify a version. [ERROR] Please specify a version.
./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>] ./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
Example: Example:
./update_version.py 3.7.1 2 ./update_version.py 3.7.1 2
""" """)
exit(1) exit(1)
NEW_VERSION = sys.argv[1] NEW_VERSION = sys.argv[1]
NEW_VERSION_INFO = [int(x) for x in NEW_VERSION.split('.')] NEW_VERSION_INFO = [int(x) for x in NEW_VERSION.split('.')]
if len(NEW_VERSION_INFO) != 3: if len(NEW_VERSION_INFO) != 3:
print """ print("""
[ERROR] Version must be in the format <MAJOR>.<MINOR>.<MICRO> [ERROR] Version must be in the format <MAJOR>.<MINOR>.<MICRO>
Example: Example:
./update_version.py 3.7.3 ./update_version.py 3.7.3
""" """)
exit(1) exit(1)
RC_VERSION = -1 RC_VERSION = -1
@ -71,9 +71,9 @@ def RewriteXml(filename, rewriter, add_xml_prefix=True):
content = document.toxml().replace('<?xml version="1.0" ?>', '') content = document.toxml().replace('<?xml version="1.0" ?>', '')
file_handle = open(filename, 'wb') file_handle = open(filename, 'wb')
if add_xml_prefix: if add_xml_prefix:
file_handle.write('<?xml version="1.0" encoding="UTF-8"?>\n') file_handle.write(b'<?xml version="1.0" encoding="UTF-8"?>\n')
file_handle.write(content) file_handle.write(content.encode('utf-8'))
file_handle.write('\n') file_handle.write(b'\n')
file_handle.close() file_handle.close()
@ -83,7 +83,7 @@ def RewriteTextFile(filename, line_rewriter):
for line in lines: for line in lines:
updated_lines.append(line_rewriter(line)) updated_lines.append(line_rewriter(line))
if lines == updated_lines: if lines == updated_lines:
print '%s was not updated. Please double check.' % filename print('%s was not updated. Please double check.' % filename)
f = open(filename, 'w') f = open(filename, 'w')
f.write(''.join(updated_lines)) f.write(''.join(updated_lines))
f.close() f.close()
@ -245,11 +245,11 @@ def UpdateMakefile():
protobuf_version_offset = 11 protobuf_version_offset = 11
expected_major_version = 3 expected_major_version = 3
if NEW_VERSION_INFO[0] != expected_major_version: if NEW_VERSION_INFO[0] != expected_major_version:
print """[ERROR] Major protobuf version has changed. Please update print("""[ERROR] Major protobuf version has changed. Please update
update_version.py to readjust the protobuf_version_offset and update_version.py to readjust the protobuf_version_offset and
expected_major_version such that the PROTOBUF_VERSION in src/Makefile.am is expected_major_version such that the PROTOBUF_VERSION in src/Makefile.am is
always increasing. always increasing.
""" """)
exit(1) exit(1)
protobuf_version_info = '%d:%d:0' % ( protobuf_version_info = '%d:%d:0' % (

Write Preview
Loading…
Cancel
Save