Skip to content

P
protobuf
Unverified Commit 580e1890 authored by Paul Yang's avatar Paul Yang Committed by GitHub
Browse files
Options

Merge pull request #5766 from TeBoring/3.7.x-fix 

Update version number to 3.7.0rc3
parents c7b33922 b52754b7
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 44 deletions
Protobuf.podspec
View file @ 580e1890
...@@ -5,7 +5,7 @@ ...@@ -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.7.0' s.version = '3.7.0-rc.3'
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'
......
configure.ac
View file @ 580e1890
...@@ -17,7 +17,7 @@ AC_PREREQ(2.59) ...@@ -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.7.0],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[3.7.0-rc-3],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
......
csharp/Google.Protobuf.Tools.nuspec
View file @ 580e1890
...@@ -5,7 +5,7 @@ ...@@ -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.7.0</version> <version>3.7.0-rc.3</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>
......
csharp/src/Google.Protobuf/Google.Protobuf.csproj
View file @ 580e1890
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<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.7.0</VersionPrefix> <VersionPrefix>3.7.0-rc.3</VersionPrefix>
<LangVersion>6</LangVersion> <LangVersion>6</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks> <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
......
java/bom/pom.xml
View file @ 580e1890
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId> <artifactId>protobuf-bom</artifactId>
<version>3.7.0</version> <version>3.7.0-rc-3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name> <name>Protocol Buffers [BOM]</name>
......
java/core/pom.xml
View file @ 580e1890
...@@ -4,7 +4,7 @@ ...@@ -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.7.0</version> <version>3.7.0-rc-3</version>
</parent> </parent>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
......
java/pom.xml
View file @ 580e1890
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.7.0</version> <version>3.7.0-rc-3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>
......
java/util/pom.xml
View file @ 580e1890
...@@ -4,7 +4,7 @@ ...@@ -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.7.0</version> <version>3.7.0-rc-3</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
......
js/package.json
View file @ 580e1890
{ {
"name": "google-protobuf", "name": "google-protobuf",
"version": "3.7.0", "version": "3.7.0-rc.3",
"description": "Protocol Buffers for JavaScript", "description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js", "main": "google-protobuf.js",
"files": [ "files": [
......
php/ext/google/protobuf/package.xml
View file @ 580e1890
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
<email>protobuf-opensource@google.com</email> <email>protobuf-opensource@google.com</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2019-02-19</date>
<time>11:02:29</time>
<version> <version>
<release>3.7.0</release> <release>3.7.0RC3</release>
<api>3.7.0</api> <api>3.7.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>beta</release>
<api>stable</api> <api>beta</api>
</stability> </stability>
<date>2019-02-22</date>
<time>11:31:21</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>GA release.</notes> <notes>GA release.</notes>
<contents> <contents>
...@@ -278,15 +278,15 @@ G A release. ...@@ -278,15 +278,15 @@ G A release.
</release> </release>
<release> <release>
<version> <version>
<release>3.7.0</release> <release>3.7.0RC3</release>
<api>3.7.0</api> <api>3.7.0</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>beta</release>
<api>stable</api> <api>beta</api>
</stability> </stability>
<date>2019-02-19</date> <date>2019-02-22</date>
<time>11:02:29</time> <time>11:31:21</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>GA release.</notes> <notes>GA release.</notes>
</release> </release>
......
php/ext/google/protobuf/protobuf.h
View file @ 580e1890
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "upb.h" #include "upb.h"
#define PHP_PROTOBUF_EXTNAME "protobuf" #define PHP_PROTOBUF_EXTNAME "protobuf"
#define PHP_PROTOBUF_VERSION "3.7.0" #define PHP_PROTOBUF_VERSION "3.7.0RC3"
#define MAX_LENGTH_OF_INT64 20 #define MAX_LENGTH_OF_INT64 20
#define SIZEOF_INT64 8 #define SIZEOF_INT64 8
......
protoc-artifacts/pom.xml
View file @ 580e1890
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId> <artifactId>protoc</artifactId>
<version>3.7.0</version> <version>3.7.0-rc-3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protobuf Compiler</name> <name>Protobuf Compiler</name>
<description> <description>
......
python/google/protobuf/__init__.py
View file @ 580e1890
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# Copyright 2007 Google Inc. All Rights Reserved. # Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '3.7.0' __version__ = '3.7.0rc3'
if __name__ != '__main__': if __name__ != '__main__':
try: try:
......
ruby/google-protobuf.gemspec
View file @ 580e1890
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.7.0" s.version = "3.7.0.rc.3"
s.licenses = ["BSD-3-Clause"] s.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"
s.description = "Protocol Buffers are Google's data interchange format." s.description = "Protocol Buffers are Google's data interchange format."
......
update_version.py
View file @ 580e1890
#!/usr/bin/env python #!/usr/bin/env python
# Usage: ./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
#
# Example:
# ./update_version.py 3.7.1 2
# => Version will become 3.7.1-rc-2 (beta)
# ./update_version.py 3.7.1
# => Version will become 3.7.1 (stable)
import datetime import datetime
import re import re
import sys import sys
from xml.dom import minidom from xml.dom import minidom
if len(sys.argv) < 2: 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>]
Example: Example:
./update_version.py 2.1.3 ./update_version.py 3.7.1 2
""" """
exit(1) exit(1)
...@@ -21,10 +30,14 @@ if len(NEW_VERSION_INFO) != 3: ...@@ -21,10 +30,14 @@ if len(NEW_VERSION_INFO) != 3:
[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 2.1.3 ./update_version.py 3.7.3
""" """
exit(1) exit(1)
RC_VERSION = 0
if len(sys.argv) > 2:
RC_VERSION = int(sys.argv[2])
def Find(elem, tagname): def Find(elem, tagname):
for child in elem.childNodes: for child in elem.childNodes:
...@@ -41,6 +54,13 @@ def ReplaceText(elem, text): ...@@ -41,6 +54,13 @@ def ReplaceText(elem, text):
elem.firstChild.replaceWholeText(text) elem.firstChild.replaceWholeText(text)
def GetFullVersion(rc_suffix = '-rc-'):
if RC_VERSION == 0:
return NEW_VERSION
else:
return '%s%s%s' % (NEW_VERSION, rc_suffix, RC_VERSION)
def RewriteXml(filename, rewriter, add_xml_prefix=True): def RewriteXml(filename, rewriter, add_xml_prefix=True):
document = minidom.parse(filename) document = minidom.parse(filename)
rewriter(document) rewriter(document)
...@@ -74,7 +94,7 @@ def UpdateConfigure(): ...@@ -74,7 +94,7 @@ def UpdateConfigure():
lambda line : re.sub( lambda line : re.sub(
r'^AC_INIT\(\[Protocol Buffers\],\[.*\],\[protobuf@googlegroups.com\],\[protobuf\]\)$', r'^AC_INIT\(\[Protocol Buffers\],\[.*\],\[protobuf@googlegroups.com\],\[protobuf\]\)$',
('AC_INIT([Protocol Buffers],[%s],[protobuf@googlegroups.com],[protobuf])' ('AC_INIT([Protocol Buffers],[%s],[protobuf@googlegroups.com],[protobuf])'
% NEW_VERSION), % GetFullVersion()),
line)) line))
...@@ -111,44 +131,44 @@ def UpdateCsharp(): ...@@ -111,44 +131,44 @@ def UpdateCsharp():
RewriteXml('csharp/src/Google.Protobuf/Google.Protobuf.csproj', RewriteXml('csharp/src/Google.Protobuf/Google.Protobuf.csproj',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(Find(document.documentElement, 'PropertyGroup'), 'VersionPrefix'), Find(Find(document.documentElement, 'PropertyGroup'), 'VersionPrefix'),
NEW_VERSION), GetFullVersion(rc_suffix = '-rc.')),
add_xml_prefix=False) add_xml_prefix=False)
RewriteXml('csharp/Google.Protobuf.Tools.nuspec', RewriteXml('csharp/Google.Protobuf.Tools.nuspec',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(Find(document.documentElement, 'metadata'), 'version'), Find(Find(document.documentElement, 'metadata'), 'version'),
NEW_VERSION)) GetFullVersion(rc_suffix = '-rc.')))
def UpdateJava(): def UpdateJava():
RewriteXml('java/pom.xml', RewriteXml('java/pom.xml',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(document.documentElement, 'version'), NEW_VERSION)) Find(document.documentElement, 'version'), GetFullVersion()))
RewriteXml('java/bom/pom.xml', RewriteXml('java/bom/pom.xml',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(document.documentElement, 'version'), NEW_VERSION)) Find(document.documentElement, 'version'), GetFullVersion()))
RewriteXml('java/core/pom.xml', RewriteXml('java/core/pom.xml',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(Find(document.documentElement, 'parent'), 'version'), Find(Find(document.documentElement, 'parent'), 'version'),
NEW_VERSION)) GetFullVersion()))
RewriteXml('java/util/pom.xml', RewriteXml('java/util/pom.xml',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(Find(document.documentElement, 'parent'), 'version'), Find(Find(document.documentElement, 'parent'), 'version'),
NEW_VERSION)) GetFullVersion()))
RewriteXml('protoc-artifacts/pom.xml', RewriteXml('protoc-artifacts/pom.xml',
lambda document : ReplaceText( lambda document : ReplaceText(
Find(document.documentElement, 'version'), NEW_VERSION)) Find(document.documentElement, 'version'), GetFullVersion()))
def UpdateJavaScript(): def UpdateJavaScript():
RewriteTextFile('js/package.json', RewriteTextFile('js/package.json',
lambda line : re.sub( lambda line : re.sub(
r'^ "version": ".*",$', r'^ "version": ".*",$',
' "version": "%s",' % NEW_VERSION, ' "version": "%s",' % GetFullVersion(rc_suffix = '-rc.'),
line)) line))
...@@ -176,7 +196,7 @@ def UpdateObjectiveC(): ...@@ -176,7 +196,7 @@ def UpdateObjectiveC():
RewriteTextFile('Protobuf.podspec', RewriteTextFile('Protobuf.podspec',
lambda line : re.sub( lambda line : re.sub(
r"^ s.version = '.*'$", r"^ s.version = '.*'$",
" s.version = '%s'" % NEW_VERSION, " s.version = '%s'" % GetFullVersion(rc_suffix = '-rc.'),
line)) line))
...@@ -194,8 +214,12 @@ def UpdatePhp(): ...@@ -194,8 +214,12 @@ def UpdatePhp():
root = document.documentElement root = document.documentElement
version = Find(root, 'version') version = Find(root, 'version')
ReplaceText(Find(version, 'release'), NEW_VERSION) ReplaceText(Find(version, 'release'), GetFullVersion(rc_suffix = 'RC'))
ReplaceText(Find(version, 'api'), NEW_VERSION) ReplaceText(Find(version, 'api'), NEW_VERSION)
stability = Find(root, 'stability')
ReplaceText(Find(stability, 'release'),
'stable' if RC_VERSION == 0 else 'beta')
ReplaceText(Find(stability, 'api'), 'stable' if RC_VERSION == 0 else 'beta')
now = datetime.datetime.now() now = datetime.datetime.now()
ReplaceText(Find(root, 'date'), now.strftime('%Y-%m-%d')) ReplaceText(Find(root, 'date'), now.strftime('%Y-%m-%d'))
ReplaceText(Find(root, 'time'), now.strftime('%H:%M:%S')) ReplaceText(Find(root, 'time'), now.strftime('%H:%M:%S'))
...@@ -206,7 +230,6 @@ def UpdatePhp(): ...@@ -206,7 +230,6 @@ def UpdatePhp():
% NEW_VERSION) % NEW_VERSION)
return return
changelog.appendChild(document.createTextNode(' ')) changelog.appendChild(document.createTextNode(' '))
stability = Find(root, 'stability')
release = CreateNode('release', 2, [ release = CreateNode('release', 2, [
CreateNode('version', 3, [ CreateNode('version', 3, [
FindAndClone(version, 'release'), FindAndClone(version, 'release'),
...@@ -230,18 +253,24 @@ def UpdatePhp(): ...@@ -230,18 +253,24 @@ def UpdatePhp():
'PHP_PROTOBUF_VERSION "%s"' % NEW_VERSION, 'PHP_PROTOBUF_VERSION "%s"' % NEW_VERSION,
line)) line))
RewriteTextFile('php/ext/google/protobuf/protobuf.h',
lambda line : re.sub(
r"^#define PHP_PROTOBUF_VERSION .*$",
"#define PHP_PROTOBUF_VERSION \"%s\"" % GetFullVersion(rc_suffix = 'RC'),
line))
def UpdatePython(): def UpdatePython():
RewriteTextFile('python/google/protobuf/__init__.py', RewriteTextFile('python/google/protobuf/__init__.py',
lambda line : re.sub( lambda line : re.sub(
r"^__version__ = '.*'$", r"^__version__ = '.*'$",
"__version__ = '%s'" % NEW_VERSION, "__version__ = '%s'" % GetFullVersion(rc_suffix = 'rc'),
line)) line))
def UpdateRuby(): def UpdateRuby():
RewriteTextFile('ruby/google-protobuf.gemspec', RewriteTextFile('ruby/google-protobuf.gemspec',
lambda line : re.sub( lambda line : re.sub(
r'^ s.version = ".*"$', r'^ s.version = ".*"$',
' s.version = "%s"' % NEW_VERSION, ' s.version = "%s"' % GetFullVersion(rc_suffix = '.rc.'),
line)) line))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment