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

3796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feng Xiao
f1f30b53cc Merge pull request #1926 from hotpxl/master 
[master] Add dependency cl. Fixes google/protobuf#295.
 2016-08-05 10:45:28 -07:00
Yutian Li
ddf6d1eb75 [master] Add dependency cl. Fixes google/protobuf#295. 2016-08-05 15:13:12 +08:00
Feng Xiao
c59473d53e Merge pull request #1044 from mark-whiting/master 
Adding missing generic gcc 64-bit atomicops.
 2016-08-04 11:21:40 -07:00
Thomas Van Lenten
6d134eac6f Merge pull request #1898 from sergiocampama/watchos 
Adds watch os deployment target for protobuf
 2016-08-04 10:06:47 -04:00
Feng Xiao
0dca3cc5d6 Merge pull request #1865 from podsvirov/topic-cmake-project 
CMake: Improvements and Bugfixes
 2016-08-03 11:03:15 -07:00
Feng Xiao
dedd8aec0d Merge pull request #1914 from adamatan/typo-fix 
Typo: beffer -> buffer
 2016-08-03 10:35:27 -07:00
Adam Matan
3886860aa4 Typo: beffer -> buffer 2016-08-03 14:59:18 +03:00
Konstantin Podsvirov
eefd1fdd48 CMake: Auto find ZLIB from package config if nedded 2016-08-02 22:37:36 +03:00
Joshua Haberman
8d8115bf52 Merge pull request #1878 from haberman/rubywkt 
Ruby: added API support for well-known types.
 2016-08-01 17:31:00 -07:00
Feng Xiao
e0779d5a64 Merge pull request #1903 from xfxyjwf/compatibility_tests 
Use 64-bit protoc binaries in compatibility tests.
 2016-08-01 15:16:16 -07:00
Josh Haberman
3cec2ea8d6 Ruby: added custom Struct exception type and fixed Makefile.am. 2016-08-01 14:34:54 -07:00
Feng Xiao
30647cae9f Use 64-bit protoc binaries in compatibility tests. 
Turns out travis doesn't have the library dependencies to run a 32-bit
binary.

Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
 2016-08-01 13:49:15 -07:00
Feng Xiao
ff46627725 Merge pull request #1902 from podsvirov/topic-cmake-extract-includes 
CMake: remove repeated_field_reflection.h from extract list
 2016-08-01 11:03:10 -07:00
Konstantin Podsvirov
7d275ec168 CMake: remove repeated_field_reflection.h from extract list 2016-08-01 20:54:41 +03:00
Jon Skeet
00d5a7f099 Amend the conformance tests to only use Int64/Uint64 non-wrapped values which (#1164) 
can reasonably be expected to be interoperable.

(The fact that not all Int64/Uint64 values *can* be exactly represented in
IEEE-754 and thus interoperably amongst JSON implementations is precisely the
reason for wrapping them when we serialize... it shouldn't be a surprise that
we can't round-trip in unwrapped form for all values.)
 2016-07-31 11:40:51 +01:00
Sergio Campama
275db044b2 Adds watch os deployment target for protobuf 2016-07-29 20:08:27 -07:00
Joshua Haberman
6b3d120539 Merge pull request #1887 from sheffatguidance/fix-js-api-documentation 
Fix Issue #1869: faulty js API documentation
 2016-07-29 16:52:01 -07:00
Joshua Haberman
1112989a1b Merge pull request #1884 from hochhaus/valueWriterFn 
Fix valueWriterFn_ variable name
 2016-07-29 16:09:53 -07:00
Jisi Liu
915d79efa8 Merge pull request #1895 from google/3.0.0-GA 
Merge GA branch for makedist fix.
 2016-07-29 14:49:13 -07:00
Jisi Liu
3ef07568cd Merge pull request #1894 from pherl/fixdist 
Add python/setup.cfg into dist files
 2016-07-29 14:43:52 -07:00
Jisi Liu
e139117108 Add python/setup.cfg into dist files 2016-07-29 14:40:05 -07:00
Jisi Liu
169d0ca43c Merge pull request #1893 from google/3.0.0-GA 
Merge 3.0.0-GA into master
 2016-07-29 14:27:53 -07:00
Jisi Liu
c4790429fc Merge pull request #1892 from xfxyjwf/compatibility_tests 
Run Java compatibility tests on Travis.
 2016-07-29 14:24:42 -07:00
Feng Xiao
baa4023cd5 Run Java compatibility tests on Travis. 
The test is testing the binary/source compatibility between 3.0.0-beta-4
and the current version (right now it's 3.0.0).

Change-Id: Ic410b535758b38cee7baa99a15a0433734df44e6
 2016-07-29 14:11:21 -07:00
Jisi Liu
f3449e5f57 Merge pull request #1891 from pherl/python 
add setup.cfg for building wheels
 2016-07-29 14:04:26 -07:00
Jisi Liu
811674f479 add setup.cfg for building wheels 2016-07-29 14:02:07 -07:00
Feng Xiao
42e54876be Merge pull request #1882 from legrosbuffle/fix-check 
Be consistent with the use of CHECK()/ GOOGLE_CHECK().
 2016-07-29 12:26:24 -07:00
Jisi Liu
7e93458bb7 Merge pull request #1888 from pherl/fixbuildzip 
Fix the build-zip.sh to add .exe for win packages.
 2016-07-29 11:47:47 -07:00
Jisi Liu
6a59ac94e1 Fix the build-zip.sh to add .exe for win packages. 2016-07-29 11:44:05 -07:00
sheffatguidance
9a11ab4f4f Fix Issue #1869: faulty js API documentation 2016-07-29 12:53:59 -05:00
Andy Hochhaus
a2174089b2 Fix valueWriterFn variable name 2016-07-29 09:21:01 -07:00
Clement Courbet
c466f4b539 Be consistent with the use of CHECK()/ GOOGLE_CHECK(). 2016-07-29 16:59:42 +02:00
Josh Haberman
a207a2bd00 Fix for JRuby (assert_true is not present). 2016-07-28 17:54:16 -07:00
Josh Haberman
e3094a8d80 Ruby: added API support for well-known types. 2016-07-28 17:02:33 -07:00
Jisi Liu
de30c56391 Merge pull request #1874 from pherl/buildzip 
Change the build.zip.sh to support lite
 2016-07-28 14:48:46 -07:00
Jisi Liu
e3fac65add Change the build.zip.sh to support lite 2016-07-28 14:24:05 -07:00
Jisi Liu
2662fd3d0c Merge pull request #1871 from pherl/fixwin 
Fix build protoc script for windows
 2016-07-28 12:53:42 -07:00
Jisi Liu
1b1a8f4017 Fix build protoc script for windows 2016-07-28 19:07:54 +00:00
Konstantin Podsvirov
33d2b2a04f CMake: Bugfix for protobuf_MODULE_COMPATIBLE 
Removed excess endif()
 2016-07-28 01:32:32 +03:00
Konstantin Podsvirov
38c5f2f3e6 CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled 2016-07-28 01:28:49 +03:00
Jisi Liu
e8ae137c96 Merge pull request #1864 from pherl/galogs 
Change log for 3.0 GA release.
 2016-07-27 14:40:30 -07:00
Josh Haberman
e7982e409d Fixed Makefile.am for Ruby file rename. 2016-07-27 14:35:39 -07:00
Jisi Liu
e0d817e0de Change log for 3.0 GA release. 2016-07-27 12:08:01 -07:00
Jisi Liu
be78976ac8 Merge pull request #1861 from jskeet/fix_to_camel_case 
Bring C#'s ToPascalCase method in line with C++.
 2016-07-27 10:48:43 -07:00
Jisi Liu
af2fa056f7 Merge pull request #1859 from jskeet/remove-flag 
Remove legacy_enum_values flag for GA.
 2016-07-27 10:47:12 -07:00
Jon Skeet
a8aae8989c Bring C#'s ToPascalCase method in line with C++. 
(This still doesn't fix the conformance tests, but at least
we're now consistent with the C++ code.)
 2016-07-27 10:49:13 +01:00
Jon Skeet
e67204752f Remove legacy_enum_values flag for GA. 2016-07-27 09:12:48 +01:00
Jisi Liu
7ba044a1c0 Merge pull request #1853 from pherl/3.0.0-GA 
Make protoc-artifacts able to build plugins.
 2016-07-26 16:51:47 -07:00
Jisi Liu
7c9c314ca7 fix comments. 2016-07-26 16:51:30 -07:00
Jisi Liu
0750797db4 Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA 2016-07-26 16:36:37 -07:00