Commit Graph

5699 Commits

Author SHA1 Message Date
Feng Xiao
a0e82dbe56
Merge pull request #4725 from ThomasColthurst/patch-2
Remove cycle in dependency graph
2018-06-09 23:25:56 -07:00
Loo Rong Jie
0456e269ee Align Bazel on Windows with CMake's MSVC flags (#4720)
* Align Bazel on Windows with CMake's MSVC flags
2018-06-05 19:03:24 -07:00
Sergio Campamá
6933e2f499 Update code to work for Xcode 10b1 (#4729)
* Update code to work for Xcode 10b

* Update README and test scripts to mention that Xcode 7 is no longer supported
2018-06-05 15:14:19 -04:00
Thomas Colthurst
ee8d3aa308
Remove cycle in dependency graph 2018-06-04 16:38:58 -04:00
Yilun Chong
a4d16ed886
Merge pull request #4699 from BSBandme/add_proto2_to_proto3_plugin
Add proto2 to proto3 util
2018-06-04 12:03:58 -07:00
Yilun Chong
61dac6d592 Fix 2018-06-04 10:16:40 -07:00
Feng Xiao
a7252bf42d
Merge pull request #4698 from ThomasColthurst/proto_c_api
Introduce Proto C API; based on cl/198113115 by amauryfa
2018-06-03 14:54:53 -07:00
Feng Xiao
17ab85deab
Merge pull request #4714 from dcarp/reference_protobuf_d
Add reference to protobuf-d
2018-06-03 14:27:47 -07:00
Dragos Carp
ceaf0122f2 Add reference to protobuf-d
https://github.com/dcarp/protobuf-d is a conformance tested proto3
runtime library and code generator for D.
2018-06-02 11:19:25 +02:00
Feng Xiao
143851ed25
Remove js_embed binary. (#4709)
* Remove js_embed binary.
2018-06-01 11:00:04 -07:00
Adam Cozzette
dfa94c7692
Merge pull request #4710 from jtattermusch/upport_4706
Upport to master: Require C++11 and pass -std=c++11
2018-06-01 09:42:58 -07:00
Adam Cozzette
5f418d4776 Require C++11 and pass -std=c++11
This commit updates the Autotools build to require a C++11 compiler and
explicitly pass -std=c++11. This seems to be necessary for enabling
C++11 support in older compilers.
2018-06-01 09:44:36 +02:00
Adam Cozzette
f8262db919
Merge pull request #4703 from acozzette/thread-safety-annotations
Added Clang thread-safety annotations in mutex.h
2018-05-31 11:20:00 -07:00
Yilun Chong
193af9f4c1 Add proto2 to proto3 util 2018-05-30 17:06:45 -07:00
Adam Cozzette
adc408698a Added Clang thread-safety annotations in mutex.h
For Clang's thread safety analysis (-Wthread-safety) to pass without warnings,
we need to annotate WrappedMutex to indicate that Lock() acquires the lock and
Unlock() releases it. This CL adds the annotations and guards them with an
ifdef to make sure they're a no-op on compilers other than Clang.

This is a cherry-pick of a change I already made to the Google-internal
codebase.
2018-05-30 14:07:31 -07:00
Adam Cozzette
cf242503ec
Merge pull request #4676 from acozzette/update-changelog-script
Updated generate_changelog.py
2018-05-30 11:07:11 -07:00
Adam Cozzette
91aebb30c0
Merge pull request #4643 from acozzette/merge-3-5-x
Merge 3.5.x branch into master
2018-05-30 10:43:31 -07:00
Thomas Colthurst
7c6514245b Introduce Proto C API; based on cl/198113115 by amauryfa 2018-05-30 10:33:02 -04:00
Paul Yang
6b5fb0727a
Move methods out of class (#4697) 2018-05-29 21:51:54 -07:00
Paul Yang
7d1a8fff1b
Fix php memory leak test (#4692) 2018-05-29 10:25:05 -07:00
leovitch
2804902446 [ObjC] Add ability to introspect list of enum values (#4678)
Added new API to GPBEnumDescriptor to enable introspection of enum values.

Refactored implementation so that this contains a minimum of added code.

Clarified comments regarding behavior in the presence of the alias_allowed option.

Added unit tests for new functionality and for the alias case.
2018-05-29 08:08:00 -04:00
Paul Yang
264e615e8e
Add back GeneratedClassName to public (#4686)
These methods are used by grpc
2018-05-25 15:24:42 -07:00
Feng Xiao
6e7eeb3431
Merge pull request #4677 from xfxyjwf/bazel
Remove jruby from kokoro tests
2018-05-24 17:50:30 -07:00
Feng Xiao
8175c6e444
Merge pull request #4659 from calder/bazel-python-namespace-fix
Declare 'google' namespace when importing Python protobuf via Bazel
2018-05-24 16:35:16 -07:00
Feng Xiao
35bd9fd05e Remove jruby badge from our README.md. 2018-05-24 16:33:51 -07:00
Feng Xiao
38a794c02f Delete jruby kokoro tests. 2018-05-24 16:32:20 -07:00
Feng Xiao
f65f16a734
Merge pull request #4674 from xfxyjwf/bazel
Add kokoro configs for bazel build.
2018-05-24 16:10:41 -07:00
Adam Cozzette
c8440a35a1 Updated generate_changelog.py
I removed references to javanano, since that implementation no longer
exists. While I was at it I found a couple places where it looked like
the wrong directory was used by mistake and I fixed them.
2018-05-24 15:59:16 -07:00
Feng Xiao
ffc8b35c83 Add kokoro configs for bazel build. 2018-05-24 14:02:48 -07:00
Paul Yang
00d32539c6 Fix array constructor in c extension for compatibility (#4667)
In old generated code, the constructor of message doesn't provide a
default null to parent's constructor. Previously, in c extesnion, this
case was not handled.
2018-05-24 13:39:41 -07:00
Brent Shaffer
6737954661 PHP namespaces for nested messages and enums (#4536)
* uses namespaces for nested messages and enums

* fixes namespaces for PHP dist

* fixes namespace for Descriptors, adds Cardinality and Kind

* fixes nested namespaces for reserved words and adds tests

* adds tests and generator fix for php class prefixes

* fixes escaping of protobuf packages, enum comments, misc others

* nice refactor of generated code

* adds class files for backwards compatibility

* simplifies code with templates

* adds compatibility files to makefile

* cleanup of generator and fixes nested namespace bug

* regenerates proto types

* remove internal BC classes

* adds deprecated warning, adds methods back

* simplifies if statement

* fixes dist files

* addresses review comments

* adds back TYPE_URL_PREFIX constant

* adds @deprecated to old nested class files

* skips tests which require a separate process when protobuf.so is enabled

* Adds tests for legacy nested classes that do not require separate processes to test

* uses legacy names for GPBUtil message check

* adds block for IDE @deprecated message

* Namespace for nested message/enum in c extension

* Remove unused code
2018-05-24 13:39:41 -07:00
Bo Yang
839f71e305 Implement array constructor in php c extension. 2018-05-24 13:39:41 -07:00
Brent Shaffer
f1911f37f8 PHP array constructors for protobuf messages (#4530)
* PHP array constructors for protobuf messages

* removes Descriptor from error message

* allows mergeFrom to accept an array

* only use initWithDescriptor if instanceof MapEntry

* adds doc comments

* removes ability for constructors to take arrays for submessages

* Revert "allows mergeFrom to accept an array"

This reverts commit b7b72182d5.

* makes mergeFromArray protected and fixes mergeFrom whitespace

* Separates merging from JSON and merging from PHP array

* removes well-known types and json keys from array construction

* Addresses PR review comments

* cleans up tests

* fixes exception messages
2018-05-24 13:39:41 -07:00
Feng Xiao
b625aabbe7
Merge pull request #4669 from jtattermusch/fix_bazel_build_syntax
Fix syntax error in BUILD file
2018-05-24 10:36:06 -07:00
Jan Tattermusch
ccc56a3c1e fix syntax error in BUILD file 2018-05-24 09:51:53 -07:00
Calder Coalson
142cbe0d57 Declare 'google' namespace when importing Python protobuf via Bazel.
`python/google/__init__.py` declares the top-level 'google' namespace so that
`google.protobuf` can be imported alongside other Google Python modules like
`google.auth`.

This works well when installing protobuf via Pip, but the Bazel `//:python_srcs`
rule doesn't include this file in its `srcs`. Bazel implicitly creates an empty
`google/__init__.py`, which does *not* set up a namespace. The result is that
consuming Python protobuf via Bazel breaks all other Google Python libraries.

This fixes #4658.
2018-05-22 20:19:28 -07:00
Feng Xiao
ce57cccef9
Merge pull request #4663 from TeBoring/ruby-distcheck
Add missing ruby/tests/test_ruby_package.proto
2018-05-22 12:59:53 -07:00
Mizux
7306f549bf CMake OSX rpath management (#4620)
* CMake: Add comment for CMP0048

* CMake: osx use @rpath/ as target's install name (CMP0042)

On MacoS library should use @rpath/ as prefix path instead of absolute build path
e.g. otool -L libprotobuf.dylib
libprotobuf.dylib:
  @rpath/libprotobuf.dylib (...)
  ...

* CMake: add rpath to target for LINUX and APPLE
2018-05-22 12:52:07 -07:00
Yilun Chong
d39a73f203
Merge pull request #4660 from BSBandme/fix_kokoro_benchmark_build
Fix python benchmark build
2018-05-22 12:27:58 -07:00
Feng Xiao
e2c21e513c
Merge pull request #3984 from laszlocsomor/wildcard
Windows: expand wildcard arguments
2018-05-22 12:27:23 -07:00
Bo Yang
090fe398ef Add missing ruby/tests/test_ruby_package.proto 2018-05-22 09:53:03 -07:00
Erik Benoist
a8e2359329 Allows the json marshaller to be passed json marshal options (#4252) 2018-05-22 08:14:04 -07:00
Laszlo Csomor
5517168fa9 Windows: expand wildcard arguments
Fixes https://github.com/google/protobuf/issues/3957
2018-05-22 08:57:57 +02:00
Yilun Chong
d69fd037f8 Fix python benchmark build 2018-05-21 18:59:39 -07:00
Yilun Chong
dd2dc0f14f
Merge pull request #4634 from BSBandme/fix_kokoro_benchmark_build
Fix java benchmark bug, fix python lib cache
2018-05-21 15:16:26 -07:00
Yilun Chong
98e097233f Fix java benchmark bug, fix python library_path 2018-05-21 14:56:56 -07:00
Ittai Zeidman
4fcb36c51c remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage (#4650) 2018-05-21 13:48:10 -07:00
Adam Cozzette
2ee7c4555f
Merge pull request #4644 from acozzette/php-timestamp
Updated PHP generated code for timestamp.proto
2018-05-18 09:41:58 -07:00
Paul Yang
9ccc3e536c
Adopt ruby_package in ruby generated code. (#4627)
* Adopt ruby_package in ruby generated code.

* Add test for ruby_package
2018-05-17 17:11:06 -07:00
Adam Cozzette
6ecc87666d Updated PHP generated code for timestamp.proto 2018-05-17 14:36:03 -07:00