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

5131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul Yang
3d78561402 Merge pull request #3634 from TeBoring/ruby-bug 
Cherry pick bug fix for ruby
 2017-09-13 14:37:18 -07:00
Aaron Patterson
a459b224b5 Storing the frame on the map means we don't need the array 2017-09-13 14:28:02 -07:00
Aaron Patterson
c1dd8e85a1 Move parse frame array to the Map object 
This makes the frame stack per-parser, and per-thread.  Fixes #3250
 2017-09-13 14:27:52 -07:00
Paul Yang
8741da3e45 Revert "Fix js conformance tests. (#3604)" (#3633) 
This reverts commit 2bd55a9fbc.
 2017-09-13 14:23:59 -07:00
Bo Yang
a425dd97f2 Rename ClassNamePrefix to ConstantNamePrefix 2017-09-13 10:45:37 -07:00
Paul Yang
2bd55a9fbc Fix js conformance tests. (#3604) 
* Fix js conformance tests.

* Remove old incorrect compatibility tests
 2017-09-12 15:09:47 -07:00
Bo Yang
f46a01d0c1 Exclude valid constant name from reserved name. 2017-09-12 15:04:34 -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
Bo Yang
ddb9ef9cc3 Change array to map for reserved names in c extension 2017-09-11 15:51:57 -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
Bo Yang
89069ded5a Change array to associate array. 2017-09-11 12:30:24 -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
Bo Yang
e5d000cbb7 Add prefix to php reserved keywords. 2017-09-08 15:17:36 -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
Jan Tattermusch
6a4ffb2f90 Merge pull request #3596 from jtattermusch/csharp_target_net45 
Google.Protobuf should target net45 (and not net451)
 2017-09-07 16:39:35 +02: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
Jan Tattermusch
50a64759dd Google.Protobuf should target net45 2017-09-05 17:59:03 +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
Jisi Liu
f9b81690f5 Add TODO 2017-08-31 11:24:05 -07:00
Jisi Liu
dd69d5cb5e Fix dist check 2017-08-31 11:11:21 -07:00
Jisi Liu
baae7ea12b Add @Deprecated annotation support for proto file. 2017-08-31 10:49:58 -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
Paul Yang
2807436cd8 change the field number of php_generic_service to fix the conflict with (#3576) 
internal descriptor.proto
 2017-08-30 16:50:07 -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
21b2372331 Merge pull request #3565 from pherl/fixdist 
Add mising cmake files in dist
 2017-08-24 16:41:22 -07:00
Jisi Liu
d8c6193d2c Add mising cmake files in dist 2017-08-24 14:11:37 -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
92ea0d20ef Merge pull request #3556 from matt-kwong/kokoro_mac_v3 
Remove pre-installed softwares
 2017-08-23 12:37:47 -07:00
Matt Kwong
78432eab43 Remove pre-installed softwares 2017-08-23 12:35:09 -07:00
Jisi Liu
07de70ea2c Merge pull request #3555 from pherl/fixdist 
Make distcheck aware of test proto files.
 2017-08-23 12:33:57 -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
Jisi Liu
55fdbe58f0 Make distcheck aware of test proto files. 2017-08-23 11:35:48 -07:00