Commit Graph

4219 Commits

Author SHA1 Message Date
Feng Xiao
e9d9e56a6b Merge pull request #2290 from ramrunner/OpenBSDsupport
define no_threadlocal on OpenBSD
2016-10-26 16:53:14 -07:00
ramrunner
bfc1299a09 define no_threadlocal on OpenBSD 2016-10-26 17:05:56 -06:00
Jisi Liu
734930f919 Merge pull request #2284 from pherl/plugin_opt
Support extra parameters for plugins.
2016-10-26 13:42:08 -07:00
Jisi Liu
2e314a697a Add comments about converting directives into PluginName 2016-10-26 13:40:36 -07:00
Jisi Liu
59cd5d0e26 Support extra parameters for plugins. 2016-10-25 17:43:59 -07:00
Paul Yang
51c5ff889c Fix pure php implementation for 32-bit machine. (#2282) 2016-10-25 17:27:05 -07:00
Feng Xiao
58580da373 Merge pull request #2274 from nmittler/gae
Hacking ByteBufferWriter to work with GAE
2016-10-20 11:28:01 -07:00
nmittler
c0f95c6f94 Hacking ByteBufferWriter to work with GAE
Fixes #2269
2016-10-20 11:25:11 -07:00
Feng Xiao
9c6940f3bb Merge pull request #2264 from rshin/master
Place Python extensions correctly in Bazel build.
2016-10-19 17:33:59 -07:00
Richard Shin
7c913d821e Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS 2016-10-19 13:36:23 -07:00
Richard Shin
df5841f0b2 Place Python extensions correctly in Bazel build. 2016-10-18 13:17:27 -07:00
Feng Xiao
008b5a228b Merge pull request #2254 from JasonLunn/patch-1
Use git clean before installing via bundler
2016-10-16 13:28:18 -07:00
Jason Lunn
9ec7a47ee8 Use git clean before installing via bundler 2016-10-14 01:01:08 -04:00
Feng Xiao
993d604030 Merge pull request #1959 from abergmeier-dsfishlabs/feature/cpp
Need to expose generated protobuf C++ headers
2016-10-13 15:31:18 -07:00
Paul Yang
ad88f905ae Merge pull request #2251 from TeBoring/master
Merge 3.1.x branch into master.
2016-10-13 14:37:21 -07:00
Bo Yang
686a19c9b7 Merge 3.1.x into master. 2016-10-13 14:25:43 -07:00
Paul Yang
e28286fa05 Add 32-bit machine test on jenkins. (#2245) 2016-10-12 12:55:48 -07:00
Feng Xiao
afaa827860 Merge pull request #2246 from fweikert/patch-1
Declare all inputs of protoc action
2016-10-12 10:48:22 -07:00
Florian Weikert
c2b3e70efd Declare all inputs of protoc action
ctx.executable.plugin must be in the inputs of protoc's action when using a plugin, otherwise the action will fail.

This bug has been hidden by a bug in Bazel: for every ctx.action, Bazel used to automatically add the runfiles of all executable inputs of the RULE instead of using the inputs of the specific ACTION. Consequently, we could get away with underspecifying the inputs of the action.
2016-10-12 14:03:07 +02:00
Paul Yang
60d95f36c0 Fix the bug that message without namespace is not found in the descriptor pool. (#2240) 2016-10-11 10:36:25 -07:00
Feng Xiao
0321baf9e8 Merge pull request #2203 from mrry/msvc_fix
Fix MSVC build when HAVE_LONG_LONG is defined.
2016-10-11 10:28:05 -07:00
Wojciech Mandrysz
7332ffb1f0 JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because of functions limited availability, fixed typo in tests. 2016-10-10 23:00:01 +02:00
Paul Yang
fd046f6263 Merge pull request #2234 from TeBoring/master
Merge 3.1.x branch into master.
2016-10-10 13:58:39 -07:00
Paul Yang
daba6653f1 Fix python_cpp test on Mac. Link staticly when building extension, so that the extension doesn't require installing protobuf library. (#2232) 2016-10-10 11:44:54 -07:00
Bo Yang
5be6325c1f Add csharp/build_tools.sh for dist check. 2016-10-10 11:44:54 -07:00
Bo Yang
63448e6059 Fix compile error for php on Mac. 2016-10-10 11:44:54 -07:00
Bo Yang
4f3d20a500 Fix segmentation fault when ZTS is defined. 2016-10-10 11:44:54 -07:00
Stanley Cheung
1e5d4ba938 PHP: fix ZTS tsrm_ls errors (#2189)
* PHP: fix ZTS tsrm_ls errors

* Fix a few more macros
2016-10-10 11:44:54 -07:00
Bo Yang
c96dd669a9 Add test for php zts build. 2016-10-10 11:44:54 -07:00
Bo Yang
447dee19a8 Prepare jenkins for testing php zts build. 2016-10-10 11:44:54 -07:00
Adam Cozzette
70477613b9 Do strict enum name checking only for proto3
There seem to already be .proto files out there that have conflicting
enum names, which will not be able to build successfully for some
languages (like C#). To prevent this problem from spreading, let's make
it an error for proto3 but just issue a warning for proto2. This fixes
issue #2179.
2016-10-10 11:44:54 -07:00
Bo Yang
34cdaf4c36 Add travis test on Mac for php. 2016-10-10 11:44:54 -07:00
Bo Yang
c8bd36e5b9 Test php5.5_c test on jenkins 2016-10-10 11:44:54 -07:00
Bo Yang
c0719f062c Trigger automated tests for php. 2016-10-10 11:44:54 -07:00
Bo Yang
91bbff217e Set up environment for php automated tests. 2016-10-10 11:44:54 -07:00
Bo Yang
fd332d146d Add php test script for automated tests. 2016-10-10 11:44:21 -07:00
Bo Yang
89db7ce02b Add script to build Google.Protobuf.Tools for csharp. 2016-10-10 11:44:21 -07:00
Josh Haberman
f2eeaf7110 Added alias getFieldProto3 as used by older generated code.
Un-breaks users who have old generated code and upgrade
to the 3.1.0 release.
2016-10-10 11:44:21 -07:00
Adam Cozzette
4a4a1627c1 Fixed references to foreign nested messages with CommonJS-style imports
A bug was causing generated JSPB code with CommonJS-style imports to
refer incorrectly to nested messages from other .proto files. The
generated code would have things like "test_pb.InnerMessage" instead of
"test_pb.OuterMessage.InnerMessage". This commit fixes the problem by
correctly taking into account any message nesting.
2016-10-10 11:44:21 -07:00
Bo Yang
0bf5482712 Fixing inconsistent php version number. 2016-10-10 11:44:21 -07:00
Feng Xiao
ae9455c274 Fix MSVC stack overflow issue. 2016-10-10 11:44:21 -07:00
Bo Yang
e0a6e52023 Add php files for make dist. 2016-10-10 11:44:21 -07:00
Paul Yang
17cc42a45a Update change log for 3.1.0 (#2173) 2016-10-10 11:44:21 -07:00
Feng Xiao
8db25a2975 Force a rebuild of Jenkins docker image.
Needed to pick up a Java dependency change and re-populate the offline
repo.

[skip ci]
2016-10-10 11:44:21 -07:00
Stanley Cheung
a41349dd68 php: support 5.5.9 for pecl extension (#2174) 2016-10-10 11:44:21 -07:00
Feng Xiao
39685f67d7 Fix VS test failures. 2016-10-10 11:44:21 -07:00
Feng Xiao
2937c67429 Use "appveyor DownloadFile"
"ps: StartFileDownload" is broken by a recent appveyor image update:
http://help.appveyor.com/discussions/problems/5308-ci-frequently-hangs-with-recent-image-update

Change-Id: Ia73aa8b12f77eb9bbec556a4c05310153aad97bf
2016-10-10 11:44:21 -07:00
Bo Yang
b155958859 Update php supported version. 2016-10-10 11:44:21 -07:00
Feng Xiao
9e260a323b Reduce test length to avoid stack overflow on VS. 2016-10-10 11:44:21 -07:00
Bo Yang
1c4cf0eeb5 Fix python cpp. 2016-10-10 11:44:21 -07:00