Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds support for appledoc in generated code. (#1928) | Sergio Campamá | 2016-08-09 | 20 | -851/+1041 |
| | | | | | | Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs. Fixes https://github.com/google/protobuf/issues/1866 | ||||
* | Merge pull request #1842 from udnaan/master | Feng Xiao | 2016-08-08 | 1 | -1/+1 |
|\ | | | | | fixed cmake config files install path | ||||
| * | fixed cmake config files install path | Adnan | 2016-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb. This brings us more into line with other langauges, and makes it more obvious when we are requiring protobuf generated code. Add a script to build protoc zip packages. [ci skip] Change-Id: Ia0e0bf3bb6bd24633dc8f294318bb20ac837f8b9 Ruby: translate package names from snake_case -> PascalCase. Added unit test for PascalCasing package names in Ruby. Added new file to ruby_EXTRA_DIST. | ||||
* | | Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867) | Sergio Campamá | 2016-08-08 | 14 | -774/+9524 |
| | | | | | | | | | | | | | | | | Work for #1866 Migrates all the public class docs over to appledoc format. While Xcode is fine with blank lines in `///` comments, appledoc (used by cocoadocs) isn't and was leaving a bunch of info off the doc pages. The generator still needs to be updated to do this also; that will be a follow up CL. | ||||
* | | Merge pull request #1923 from bryongloden/patch-1 | Feng Xiao | 2016-08-05 | 1 | -0/+1 |
|\ \ | | | | | | | close opened file descriptors properly | ||||
| * | | close opened file descriptors properly | Bryon Gloden, CISSP® | 2016-08-05 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1924 from PiotrSikora/export_license | Jisi Liu | 2016-08-05 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Bazel: export LICENSE file. | ||||
| * | | | Bazel: export LICENSE file. | Piotr Sikora | 2016-08-04 | 1 | -0/+2 |
| |/ / | | | | | | | | | | Signed-off-by: Piotr Sikora <piotrsikora@google.com> | ||||
* | | | Merge pull request #1926 from hotpxl/master | Feng Xiao | 2016-08-05 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | [master] Add dependency cl. Fixes google/protobuf#295. | ||||
| * | | [master] Add dependency cl. Fixes google/protobuf#295. | Yutian Li | 2016-08-05 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #1044 from mark-whiting/master | Feng Xiao | 2016-08-04 | 1 | -0/+18 |
|\ \ | | | | | | | Adding missing generic gcc 64-bit atomicops. | ||||
| * | | Adding missing generic gcc 64-bit atomicops. | Mark Whiting | 2015-12-14 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for 64-bit big endian MIPS I was getting undefined references to the following four functions during linking. NoBarrier_AtomicIncrement NoBarrier_Store NoBarrier_AtomicExchange NoBarrier_Load Adding 64-bit versions of them to atomicops_internals_generic_gcc.h fixed the compilation issues. | ||||
* | | | Merge pull request #1898 from sergiocampama/watchos | Thomas Van Lenten | 2016-08-04 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Adds watch os deployment target for protobuf | ||||
| * | | | Adds watch os deployment target for protobuf | Sergio Campama | 2016-07-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #1865 from podsvirov/topic-cmake-project | Feng Xiao | 2016-08-03 | 4 | -2/+9 |
|\ \ \ \ | | | | | | | | | | | CMake: Improvements and Bugfixes | ||||
| * | | | | CMake: Auto find ZLIB from package config if nedded | Konstantin Podsvirov | 2016-08-02 | 2 | -0/+5 |
| | | | | | |||||
| * | | | | CMake: Bugfix for protobuf_MODULE_COMPATIBLE | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Removed excess endif() | ||||
| * | | | | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #1914 from adamatan/typo-fix | Feng Xiao | 2016-08-03 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Typo: beffer -> buffer | ||||
| * | | | | | Typo: beffer -> buffer | Adam Matan | 2016-08-03 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1878 from haberman/rubywkt | Joshua Haberman | 2016-08-01 | 4 | -2/+338 |
|\ \ \ \ \ | | | | | | | | | | | | | Ruby: added API support for well-known types. | ||||
| * | | | | | Ruby: added custom Struct exception type and fixed Makefile.am. | Josh Haberman | 2016-08-01 | 3 | -11/+42 |
| | | | | | | |||||
| * | | | | | Fix for JRuby (assert_true is not present). | Josh Haberman | 2016-07-28 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Ruby: added API support for well-known types. | Josh Haberman | 2016-07-28 | 3 | -0/+305 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1903 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-08-01 | 1 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Use 64-bit protoc binaries in compatibility tests. | ||||
| * | | | | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-01 | 1 | -5/+5 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81 | ||||
* | | | | | Merge pull request #1902 from podsvirov/topic-cmake-extract-includes | Feng Xiao | 2016-08-01 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | CMake: remove repeated_field_reflection.h from extract list | ||||
| * | | | | | CMake: remove repeated_field_reflection.h from extract list | Konstantin Podsvirov | 2016-08-01 | 1 | -1/+0 |
|/ / / / / | |||||
* | | / / | Amend the conformance tests to only use Int64/Uint64 non-wrapped values ↵ | Jon Skeet | 2016-07-31 | 2 | -8/+12 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.) | ||||
* | | | | Merge pull request #1887 from sheffatguidance/fix-js-api-documentation | Joshua Haberman | 2016-07-29 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Fix Issue #1869: faulty js API documentation | ||||
| * | | | | Fix Issue #1869: faulty js API documentation | sheffatguidance | 2016-07-29 | 1 | -2/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1884 from hochhaus/valueWriterFn | Joshua Haberman | 2016-07-29 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix valueWriterFn_ variable name | ||||
| * | | | | Fix valueWriterFn variable name | Andy Hochhaus | 2016-07-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1895 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Merge GA branch for makedist fix. | ||||
| * \ \ \ | Merge pull request #1894 from pherl/fixdist | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Add python/setup.cfg into dist files | ||||
| | * | | | | Add python/setup.cfg into dist files | Jisi Liu | 2016-07-29 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #1893 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 23 | -53/+158 |
|\| | | | | | | | | | | | | | | Merge 3.0.0-GA into master | ||||
| * | | | | Merge pull request #1892 from xfxyjwf/compatibility_tests | Jisi Liu | 2016-07-29 | 2 | -0/+13 |
| |\ \ \ \ | | | | | | | | | | | | | Run Java compatibility tests on Travis. | ||||
| | * | | | | Run Java compatibility tests on Travis. | Feng Xiao | 2016-07-29 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | Merge pull request #1891 from pherl/python | Jisi Liu | 2016-07-29 | 1 | -0/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | add setup.cfg for building wheels | ||||
| | * | | | | add setup.cfg for building wheels | Jisi Liu | 2016-07-29 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #1888 from pherl/fixbuildzip | Jisi Liu | 2016-07-29 | 1 | -2/+8 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix the build-zip.sh to add .exe for win packages. | ||||
| | * | | | | Fix the build-zip.sh to add .exe for win packages. | Jisi Liu | 2016-07-29 | 1 | -2/+8 |
| |/ / / / | |||||
| * | | | | Merge pull request #1874 from pherl/buildzip | Jisi Liu | 2016-07-28 | 2 | -19/+31 |
| |\ \ \ \ | | | | | | | | | | | | | Change the build.zip.sh to support lite | ||||
| | * | | | | Change the build.zip.sh to support lite | Jisi Liu | 2016-07-28 | 2 | -19/+31 |
| | | | | | | |||||
| * | | | | | Merge pull request #1871 from pherl/fixwin | Jisi Liu | 2016-07-28 | 1 | -5/+3 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix build protoc script for windows | ||||
| | * | | | | Fix build protoc script for windows | Jisi Liu | 2016-07-28 | 1 | -5/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #1864 from pherl/galogsv3.0.0 | Jisi Liu | 2016-07-27 | 1 | -0/+51 |
| |\ \ \ \ | | | | | | | | | | | | | Change log for 3.0 GA release. | ||||
| | * | | | | Change log for 3.0 GA release. | Jisi Liu | 2016-07-27 | 1 | -0/+51 |
| |/ / / / | |||||
| * | | | | Merge pull request #1853 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 | 2 | -8/+22 |
| |\ \ \ \ | | | | | | | | | | | | | Make protoc-artifacts able to build plugins. |