AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,010 Commits 35 Branches 138 Tags 124 MiB
13fd045dbb
Commit Graph

5010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
d1bc27caef Merge pull request #3626 from xfxyjwf/fixgo 
Fix go example test.
 2017-09-13 17:57:10 -07:00
Feng Xiao
8136ccb296 Fix go example test. 
It needs "-I" flag to find imported file google/protobuf/timestamp.proto
 2017-09-13 17:04:13 -07:00
Feng Xiao
c0d88ae300 Merge pull request #3635 from drivehappy/clang_cleanup 
Clang warning cleanup for unused parameter.
 2017-09-13 16:40:01 -07:00
drivehappy
7f3ded663b Clang warning cleanup for unused parameter. 2017-09-13 16:10:35 -07:00
Feng Xiao
471b45e895 Merge pull request #3158 from yeswalrus/fix-policy-warning 
Fix policy warning CMP0054
 2017-09-13 15:15:04 -07:00
Jan Tattermusch
06aa8dc9e7 Merge pull request #3621 from jtattermusch/upport_3596 
Google.Protobuf should target net45 (upport to upstream/master)
 2017-09-12 22:46:52 +02:00
Feng Xiao
ed0a07eadd Merge pull request #3618 from hesmar/fix_protobuf_generate 
fix protobuf_generate function
 2017-09-12 11:09:02 -07:00
Jan Tattermusch
5de05654aa Google.Protobuf should target net45 2017-09-12 11:56:34 +02:00
Markus Heß
444aecd35a fix protobuf_generate function 2017-09-12 10:00:04 +02:00
Feng Xiao
b1befb08c0 Merge pull request #3613 from xfxyjwf/bazel_examples 
Add bazel support for examples.
 2017-09-11 18:19:06 -07:00
Feng Xiao
6945203300 Exclude addressbook.proto from C# boostrap test. 
This addressbook.proto now belongs to its own bazel pacakge and can't be
accessed in bazel protobuf_test target.
 2017-09-11 17:00:11 -07:00
Feng Xiao
49b31dc5f7 Update C# generated file for addressbook.proto 2017-09-11 14:43:14 -07:00
Feng Xiao
49b88af4a2 Update examples file list. 2017-09-11 12:48:53 -07:00
Jack Wakefield
174c82d8ce Add well-known timestamps to JSON for PHP (#3564) 2017-09-10 15:17:50 -07:00
Feng Xiao
74bf45f379 Add bazel support for examples. 
The example utilizes native bazel rules (proto_library, cc_proto_library,
java_proto_library, java_lite_proto_library) to show how easy it is to
build protobuf with bazel's native support. It also makes use of well
known types which was not possible until the latest bazel 0.5.4 release
and https://github.com/google/protobuf/pull/3594 .
 2017-09-08 16:01:49 -07:00
Feng Xiao
2ad5c0a864 Merge pull request #2576 from cristicbz/py-strutil 
python: do not include internal 'strutil.h' header
 2017-09-08 10:23:14 -07:00
Adam Cozzette
054054c152 Merge pull request #3590 from NanXiao/patch-1 
Update autogen.sh
 2017-09-06 10:31:52 -07:00
Paul Yang
7f8b91f552 Add native php support for Duration. (#3583) 2017-09-05 14:10:32 -07:00
Feng Xiao
35b852f5b8 Merge pull request #3594 from buchgr/well-known-protos 
bazel: Add proto_library rules for well known types. Fixes #2763
 2017-09-05 14:09:36 -07:00
Jakob Buchgraber
699c0eb9cf bazel: Add proto_library rules for well known types. Fixes #2763 
Adds a proto_library rule for each well known type proto:

$ bazel query "filter(\".*_proto$\", \"...\")"
//:wrappers_proto
//:timestamp_proto
//:struct_proto
//:field_mask_proto
//:empty_proto
//:duration_proto
//:compiler_plugin_proto
//:descriptor_proto
//:api_proto
//:type_proto
//:source_context_proto
//:any_proto

Bazel users can reference these proto_library rules for their own
language specific rules i.e.

java_proto_library(
  name = "any_java_proto",
  deps = ["@com_google_protobuf//:any_proto"],
)

Also set the workspace name to "com_google_protobuf", as proto_library
rules reference protobuf that way.
 2017-09-05 22:33:54 +02:00
Nan Xiao
f4ff17bb16 Update autogen.sh 
Fix the bug in following scenario:  

gmock is downloaded successfully while gtest not. Resuming "autogen.sh",
the gtest won't be downloaded. And following error will occur:  

$ ./autogen.sh
+ autoreconf -f -i -Wall,no-obsolete
aclocal: error: configure.ac:1: file 'gtest/m4/acx_pthread.m4' does not exist
autoreconf: aclocal failed with exit status: 1
 2017-09-04 15:43:54 +08:00
Joshua Haberman
6699f2cf64 Merge pull request #3560 from tenderlove/thread-safe-map 
Move parse frame array to the Map object
 2017-08-31 11:36:05 -07:00
Paul Yang
b70e0fdf09 Add php support for Timestamp. (#3575) 
* Add php support for Timestamp.

* Fix comments
 2017-08-31 10:35:31 -07:00
Aaron Patterson
f55c6ec24f
Storing the frame on the map means we don't need the array 2017-08-30 11:38:09 -07:00
Aaron Patterson
d6152dd51c
Move parse frame array to the Map object 
This makes the frame stack per-parser, and per-thread.  Fixes #3250
 2017-08-30 11:38:04 -07:00
Paul Yang
c7457ef65a Add any support in php runtime. (#3486) 
* Add any support in php runtime.

* Remove unused file in config.m4

* Fix comments

* Fix error for tsrmls build

* Add newly added file to Makefile.am
 2017-08-25 08:49:34 -07:00
Jisi Liu
98a3734b5a Merge pull request #3503 from gburgessiv/master 
Work around a bug in clang's static analyzer
 2017-08-24 10:17:55 -07:00
Jisi Liu
859d94a5f0 Merge pull request #3544 from anandolee/master 
Add Python 3.5, 3.6 && drop Python 2.6
 2017-08-24 10:17:10 -07:00
Jisi Liu
364060bb51 Merge pull request #3547 from matt-kwong/kokoro_mac_build 
Remove pre-installed softwares from prebuild steps
 2017-08-23 12:31:14 -07:00
Matt Kwong
e46caba181 Remove pre-installed softwares 2017-08-23 10:49:50 -07:00
Jisi Liu
c44c3af2bc Merge pull request #3548 from google/3.4.x 
Merge fixes from 3.4.x into master
 2017-08-22 18:39:34 -07:00
Jisi Liu
30681c7578 Merge pull request #3546 from pherl/deathtest 
Disable death tests on windows
 2017-08-22 17:45:26 -07:00
Jie Luo
610e433888 Drop python2.6 
Jenkins complains for python 2.6
DEPRECATION: Python 2.6 is no longer supported by the Python core team
ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py'
https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
 2017-08-22 16:39:26 -07:00
Jie Luo
028d6f13ee Add Python 3.5 3.6 2017-08-22 15:59:27 -07:00
Jisi Liu
6609e52124 Disable death tests on windows 
Also remove cord related code
 2017-08-22 12:59:32 -07:00
Jisi Liu
e416f5d2d3 Merge pull request #3537 from TeBoring/php-bug 
Use message name as defined in php runtime.
 2017-08-22 11:07:47 -07:00
Jisi Liu
7273b3c691 Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 
Merge pull request #3535 from drivehappy/clang_warn_cleanup
 2017-08-22 10:59:50 -07:00
Jisi Liu
09fd1259c8 Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2 
Merge pull request #3494 from drivehappy/clang_warning_macro
 2017-08-22 10:59:39 -07:00
Jisi Liu
7a43137831 Merge pull request #3543 from tony612/patch-1 
Add Elixir protobuf and gRPC to 3rd party doc
 2017-08-22 10:42:19 -07:00
George Burgess IV
6cecd20e25 Work around a bug in clang's static analyzer 
Due to https://bugs.llvm.org/show_bug.cgi?id=34198, clang's static
analyzer emits diagnostics about leaking `container`. Doing this
assignment in two steps works around this, and shouldn't cause these
issues.
 2017-08-22 10:38:23 -07:00
Bing Han
2fb74794d2 Add Elixir protobuf and gRPC to 3rd party doc 2017-08-23 00:03:01 +08:00
Jisi Liu
c27b56c692 Merge pull request #3494 from drivehappy/clang_warning_macro 
Fixing -Wexpansion-to-defined Clang warning
 2017-08-21 16:29:27 -07:00
Jisi Liu
36ac06fdc7 Merge pull request #3535 from drivehappy/clang_warn_cleanup 
Fixing unused parameter warnings under Clang.
 2017-08-21 16:28:17 -07:00
Jisi Liu
0b7e97880c Merge pull request #3535 from drivehappy/clang_warn_cleanup 
Fixing unused parameter warnings under Clang.
 2017-08-21 15:45:59 -07:00
Jisi Liu
92d768c113 Merge pull request #3536 from pherl/io32_11 
Remove C++11 features in io_win32.cc
 2017-08-21 15:17:42 -07:00
Jisi Liu
77a453a57f Fix compile errors 2017-08-21 14:21:00 -07:00
Bo Yang
dd5190980b Use message name as defined in php runtime. 2017-08-21 13:39:15 -07:00
Jisi Liu
4aadcd3c7b Remove C++11 features in io_win32.cc 
- Use scoped_array instead of unique_ptr.
- Do not use string::front() and string::back()
 2017-08-21 13:17:24 -07:00
Jisi Liu
ba4e54724d Merge pull request #3529 from pherl/merge3.4.x 
Merge 3.4.x into master
 2017-08-21 10:39:27 -07:00