Adam Cozzette
13fd045dbb
Integrated internal changes from Google
2017-09-14 10:03:57 -07:00
Jisi Liu
8084e03c33
remove profile
2017-07-19 12:46:33 -07:00
Jisi Liu
3af881c7e2
Merge master into 3.4.x
2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143
Merge from Google internal for 3.4 release
2017-07-18 15:38:30 -07:00
Dennis Cappendijk
4eb02fe31e
Add headers as part of cmake project
...
tested only on windows with visual studio 2015 as generator
2017-05-29 17:34:08 +02:00
Feng Xiao
d36c0c538a
Down-integrate from google3.
2017-03-29 14:33:05 -07:00
Konstantin Podsvirov
97cbc42621
Fix libprotoc.cmake to generate well_known_types_embed.cc
...
Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior.
Now everything will be fine.
2017-03-15 14:16:49 -07:00
Adam Cozzette
1b3a0c16e6
Auto-generate well_known_types_embed.cc
...
Until now this file was just checked into the repo, but actually it
should be generated from any.js, struct.js, and timestamp.js. This
change updates the build system to make this happen. To make it work I
also had to remove some C++11 features from embed.cc.
2016-12-19 14:38:21 -08:00
Adam Cozzette
1673389ef1
Updated libprotoc.cmake
2016-11-17 17:05:38 -08:00
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Jisi Liu
5221dcbe47
Integrate from google internal.
...
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
2016-01-29 13:51:05 -08:00
Feng Xiao
e841bac4fc
Down-integrate from internal code base.
2015-12-11 17:10:28 -08:00
Jon Skeet
a6361a124a
Rename "umbrella" to "reflection" consistently.
...
This changes csharp_names.h, which will require a corresponding change in GRPC.
2015-11-19 13:05:17 +00:00
Feng Xiao
5314ad1b21
Merge pull request #783 from podsvirov/topic-cmake-project
...
Improved CMake project
2015-10-16 14:08:38 -07:00
Konstantin Podsvirov
c3aa4c2675
Improved SHARED build from CMake project
2015-10-15 02:56:48 +03:00
Jon Skeet
67dd42c50d
First pass at generating XML documentation from .proto comments.
...
This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing.
Generated code changes coming in next commit.
2015-10-01 10:36:58 +01:00
Konstantin Podsvirov
f397ede7c6
Add CMake option protobuf_DEBUG_POSTFIX
2015-09-17 13:00:12 +03:00
Jisi Liu
c3bc155ace
Merge branch 'master' of github.com:google/protobuf
...
Change-Id: If3fb07754a734bae610d95124528e073515ac525
2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d
Down-integrate from internal branch.
...
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
2015-08-21 11:18:45 -07:00
Jon Skeet
b2ac868493
First part of implementing wrapper types. Not ready yet!
2015-07-16 09:36:30 +01:00
Jon Skeet
0d684d3420
First pass at map support.
...
More tests required. Generated code in next commit.
2015-06-25 09:39:28 +01:00
Jon Skeet
09f3f4eec3
Updates to handle use of cmake for Windows builds.
2015-06-17 15:16:14 +01:00
Feng Xiao
4333edb340
Add cmake support.
2015-05-31 02:28:34 -07:00
