Commit Graph

4236 Commits

Author SHA1 Message Date
Christopher Tubbs
eb7f3a3ad1 Use latest maven-compiler-plugin (2.6.0)
* Uses build-helper-maven-plugin to add generated sources to the classpath
* Fixes an issue building with newer versions of the maven-compiler-plugin
  (See https://issues.apache.org/jira/browse/MCOMPILER-240)
2016-11-04 02:11:55 -04:00
Feng Xiao
7bd11fcb59 Merge pull request #2301 from jbrianceau/arm-atomic-kuser-helpers-fix-v2
[arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
2016-11-03 16:59:25 -07:00
Jon Skeet
4c310d78a2 Update conformance test failure list 2016-11-03 18:05:59 +00:00
Jon Skeet
50a37e0135 Change JSON field name formatting
This affects cases with leading capital letters.

This breaks compatibility with previous C# releases, but
fixes compatibility with other implementations.

See #2278 for details.
2016-11-03 18:05:59 +00:00
Marcin Wyszynski
cb81314b1b Fix copy pasta in test 2016-11-03 15:00:40 +01:00
Marcin Wyszynski
3bdaaa5dda More Ruby-eqsue interface 2016-11-03 14:19:10 +01:00
Jisi Liu
93a4fa23d0 Merge pull request #2302 from jbrianceau/generic-gcc-atomics-strong-cmpxchg
generic atomicops: Use strong compare_exchange
2016-11-02 15:03:19 -07:00
Feng Xiao
750b9e2428 Merge pull request #2318 from mavrukin/patch-1
Fix compiler warnings when running :protobuf_test
2016-11-02 11:54:13 -07:00
Michael Avrukin
4d813de095 Fix compiler warnings when running :protobuf_test
When running >bazel test :protobuf_test a few compiler warnings came up.  They were centered around the usage of "int" as the loop counter where the value should have been a size_t.
2016-11-02 16:12:07 +02:00
Feng Xiao
8fcd24b8db Merge pull request #2307 from sinzianag/swift_protobuf
Docs: Link to Apple's Swift plugin and runtime for protobufs
2016-10-31 11:00:43 -07:00
Thomas Van Lenten
ea928a1811 Merge pull request #2309 from thomasvl/note_about_coding_support
Add note about extension use and Coding support.
2016-10-31 11:08:36 -04:00
Thomas Van Lenten
98c01858f2 Add note about extension use and Coding support. 2016-10-31 11:00:39 -04:00
Sinziana Gafitanu
9819b72d49 Adding Apple's Swift Protobuf 2016-10-30 19:40:08 -07:00
Julien Brianceau
a5a2c1d78f generic atomicops: Use strong compare_exchange
Weak compare-and-exchange are allowed to fail spuriously, so we have
to use the strong variation here.
2016-10-28 14:27:03 +02:00
Julien Brianceau
4587a3fd07 [arm/gcc] Don't rely on KUSER_HELPERS feature for atomics
ARM specific CONFIG_KUSER_HELPERS feature can be disabled in Linux kernel,
and in this case, we shouldn't crash. Use gcc built-in functions instead
of arm specific code if they are available.
2016-10-28 14:02:41 +02:00
Sergio Campamá
d58b92ae51 Adds pushLimit: and popLimit: into GPBCodedInputStream (#2297)
Adds pushLimit: and popLimit: into GPBCodedInputStream
2016-10-27 16:06:45 -04:00
Paul Yang
795976ecf5 Trigger update of docker for new changes in #2282. (#2288) 2016-10-27 10:41:44 -07:00
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