Jisi Liu
12f6e3dd0e
update header list.
...
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
2015-07-17 11:36:51 -07:00
Jisi Liu
7b216119ee
Update make file for extra headers.
...
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
2015-07-17 11:34:33 -07:00
Jon Skeet
0f442a7533
Merge pull request #611 from jskeet/csharp-wrappers
...
C# wrapper types
2015-07-17 07:29:50 +01:00
Jan Tattermusch
fa544f4835
Merge pull request #586 from jtattermusch/csharp_names_export
...
Export c# naming routines publicly
2015-07-16 17:33:56 -07:00
Jon Skeet
b2ac868493
First part of implementing wrapper types. Not ready yet!
2015-07-16 09:36:30 +01:00
Jan Tattermusch
11002e70c6
Merge remote-tracking branch 'upstream/master' into csharp-experimental
2015-07-15 20:33:59 -07:00
Jisi Liu
bd4bc9e72c
remove pbconfig from extract script
...
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
2015-07-13 10:41:18 -07:00
Jan Tattermusch
cacbedf04e
export c# naming routines publicly
2015-07-10 13:40:34 -07: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
Jan Tattermusch
60161997c8
fix typo in cmake/README.md
2015-06-24 09:27:23 -07:00
Jon Skeet
50a3a809e8
Merge remote-tracking branch 'upstream/master' into proto3-only
2015-06-19 17:35:01 +01:00
Jisi Liu
1e534d7ac3
Merge pull request #505 from pherl/bazel
...
Add bazel support for the project
2015-06-18 11:19:34 -07:00
Jisi Liu
1c42a8b336
Move cmake/update_file_lists.sh preparing for bazel support.
...
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
2015-06-17 13:31:26 -07:00
Feng Xiao
e9a122eb19
Merge pull request #501 from xfxyjwf/down
...
Down-integrate from internal code base.
2015-06-17 13:12:11 -07:00
Feng Xiao
818c5eee08
Fix broken builds.
2015-06-17 11:19:46 -07:00
Jon Skeet
09f3f4eec3
Updates to handle use of cmake for Windows builds.
2015-06-17 15:16:14 +01:00
Jisi Liu
78d470c7a5
Make the code independent of config.h
...
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h
- Make pbconfig.h a manually written file to handle hash conditions
according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.
Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
2015-06-16 18:27:36 -07:00
Feng Xiao
e96ff30120
Down-integrate from internal code base.
...
[ci skip]
Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
2015-06-15 18:24:01 -07:00
Feng Xiao
54a4cccb97
Merge pull request #481 from Qartar/master
...
Workaround for MSVC's string literal compiler limit.
2015-06-12 14:56:02 -07:00
Qartar
2fe6d7bc57
Workaround for MSVC's string literal compiler limit.
...
Escape characters don't count for string literal size, no need to pre-generate escape string.
Added unit test to touch enormous cpp generated descriptor.
Updated makefile to include enormous_descriptor.proto
Fixed language compatibility error.
2015-06-12 13:23:09 -07:00
Feng Xiao
ee6b3d5529
Remove vsprojects.
2015-06-05 23:57:01 -07:00
Feng Xiao
dffd542bb8
Update ./update_file_lists.sh.
...
Make it executable and generate extract_includes.bat in the same directory.
2015-06-05 23:36:05 -07:00
Feng Xiao
e9839ff444
Add back incorrectly excluded cmake targets.
2015-06-05 21:24:23 -07:00
Feng Xiao
2286ab328c
Fix README.md formatting.
...
Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
2015-06-04 11:28:19 -07:00
Feng Xiao
34448fca45
Add an cmake option to exclude tests.
2015-06-04 01:27:19 -07:00
Feng Xiao
4333edb340
Add cmake support.
2015-05-31 02:28:34 -07:00
