Skip to content

Commit c931743

Browse files
TeBoringTeBoring
authored
Merge branch (protocolbuffers#4466)
* Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits
1 parent 579f81e commit c931743

File tree

14 files changed

+53
-19
lines changed

14 files changed

+53
-19
lines changed

‎Protobuf.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# dependent projects use the :git notation to refer to the library.
66
Pod::Spec.new do |s|
77
s.name = 'Protobuf'
8-
s.version = '3.5.1'
8+
s.version = '3.5.2'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/google/protobuf'
1111
s.license = '3-Clause BSD License'

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
1717
# In the SVN trunk, the version should always be the next anticipated release
1818
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
1919
# the size of one file name in the dist tarfile over the 99-char limit.)
20-
AC_INIT([Protocol Buffers],[3.5.1],[[email protected]],[protobuf])
20+
AC_INIT([Protocol Buffers],[3.5.2],[[email protected]],[protobuf])
2121

2222
AM_MAINTAINER_MODE([enable])
2323

‎csharp/Google.Protobuf.Tools.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Google Protocol Buffers tools</title>
66
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
77
<description>See project site for more info.</description>
8-
<version>3.5.1</version>
8+
<version>3.5.2</version>
99
<authors>Google Inc.</authors>
1010
<owners>protobuf-packages</owners>
1111
<licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl>

‎csharp/src/Google.Protobuf/Google.Protobuf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
55
<Copyright>Copyright 2015, Google Inc.</Copyright>
66
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
7-
<VersionPrefix>3.5.1</VersionPrefix>
7+
<VersionPrefix>3.5.2</VersionPrefix>
88
<Authors>Google Inc.</Authors>
99
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎java/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.google.protobuf</groupId>
88
<artifactId>protobuf-parent</artifactId>
9-
<version>3.5.1</version>
9+
<version>3.5.2</version>
1010
</parent>
1111

1212
<artifactId>protobuf-java</artifactId>

‎java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>com.google.protobuf</groupId>
1313
<artifactId>protobuf-parent</artifactId>
14-
<version>3.5.1</version>
14+
<version>3.5.2</version>
1515
<packaging>pom</packaging>
1616

1717
<name>Protocol Buffers [Parent]</name>

‎java/util/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.google.protobuf</groupId>
88
<artifactId>protobuf-parent</artifactId>
9-
<version>3.5.1</version>
9+
<version>3.5.2</version>
1010
</parent>
1111

1212
<artifactId>protobuf-java-util</artifactId>

‎js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "google-protobuf",
3-
"version": "3.5.1",
3+
"version": "3.5.2",
44
"description": "Protocol Buffers for JavaScript",
55
"main": "google-protobuf.js",
66
"files": [

‎php/ext/google/protobuf/package.xml

+19-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<email>[email protected]</email>
1111
<active>yes</active>
1212
</lead>
13-
<date>2017-12-11</date>
13+
<date>2018-03-06</date>
1414
<time>11:02:07</time>
1515
<version>
16-
<release>3.5.1</release>
17-
<api>3.5.1</api>
16+
<release>3.5.2</release>
17+
<api>3.5.2</api>
1818
</version>
1919
<stability>
2020
<release>stable</release>
@@ -216,5 +216,21 @@ GA release.
216216
GA release.
217217
</notes>
218218
</release>
219+
<release>
220+
<version>
221+
<release>3.5.2</release>
222+
<api>3.5.2</api>
223+
</version>
224+
<stability>
225+
<release>stable</release>
226+
<api>stable</api>
227+
</stability>
228+
<date>2018-03-06</date>
229+
<time>11:02:07</time>
230+
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
231+
<notes>
232+
G A release.
233+
</notes>
234+
</release>
219235
</changelog>
220236
</package>

‎php/ext/google/protobuf/protobuf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "upb.h"
3838

3939
#define PHP_PROTOBUF_EXTNAME "protobuf"
40-
#define PHP_PROTOBUF_VERSION "3.5.1"
40+
#define PHP_PROTOBUF_VERSION "3.5.2"
4141

4242
#define MAX_LENGTH_OF_INT64 20
4343
#define SIZEOF_INT64 8

‎protoc-artifacts/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>com.google.protobuf</groupId>
1212
<artifactId>protoc</artifactId>
13-
<version>3.5.1-1</version>
13+
<version>3.5.2</version>
1414
<packaging>pom</packaging>
1515
<name>Protobuf Compiler</name>
1616
<description>

‎python/google/protobuf/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
# Copyright 2007 Google Inc. All Rights Reserved.
3232

33-
__version__ = '3.5.1'
33+
__version__ = '3.5.2'
3434

3535
if __name__ != '__main__':
3636
try:

‎python/setup.py

+22-4
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@ def get_option_from_sys_argv(option_str):
179179
# extension. Note that those libraries have to be compiled with
180180
# -fPIC for this to work.
181181
compile_static_ext = get_option_from_sys_argv('--compile_static_extension')
182-
extra_compile_args = ['-Wno-write-strings',
183-
'-Wno-invalid-offsetof',
184-
'-Wno-sign-compare']
185182
libraries = ['protobuf']
186183
extra_objects = None
187184
if compile_static_ext:
@@ -190,6 +187,27 @@ def get_option_from_sys_argv(option_str):
190187
'../src/.libs/libprotobuf-lite.a']
191188
test_conformance.target = 'test_python_cpp'
192189

190+
extra_compile_args = []
191+
192+
if sys.platform != 'win32':
193+
extra_compile_args.append('-Wno-write-strings')
194+
extra_compile_args.append('-Wno-invalid-offsetof')
195+
extra_compile_args.append('-Wno-sign-compare')
196+
197+
# https://github.com/Theano/Theano/issues/4926
198+
if sys.platform == 'win32':
199+
extra_compile_args.append('-D_hypot=hypot')
200+
201+
# https://github.com/tpaviot/pythonocc-core/issues/48
202+
if sys.platform == 'win32' and '64 bit' in sys.version:
203+
extra_compile_args.append('-DMS_WIN64')
204+
205+
# MSVS default is dymanic
206+
if (sys.platform == 'win32' and
207+
((sys.version_info[0] == 3 and sys.version_info[1] == 5) or
208+
(sys.version_info[0] == 3 and sys.version_info[1] == 6))):
209+
extra_compile_args.append('/MT')
210+
193211
if "clang" in os.popen('$CC --version 2> /dev/null').read():
194212
extra_compile_args.append('-Wno-shorten-64-to-32')
195213

@@ -217,7 +235,7 @@ def get_option_from_sys_argv(option_str):
217235
Extension(
218236
"google.protobuf.internal._api_implementation",
219237
glob.glob('google/protobuf/internal/api_implementation.cc'),
220-
extra_compile_args=['-DPYTHON_PROTO2_CPP_IMPL_V2'],
238+
extra_compile_args=extra_compile_args + ['-DPYTHON_PROTO2_CPP_IMPL_V2'],
221239
),
222240
])
223241
os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'

‎ruby/google-protobuf.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = "google-protobuf"
3-
s.version = "3.5.1.2"
3+
s.version = "3.5.2"
44
s.licenses = ["BSD-3-Clause"]
55
s.summary = "Protocol Buffers"
66
s.description = "Protocol Buffers are Google's data interchange format."

0 commit comments

Comments
 (0)