Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get VS 2015 to use const int definitions | Bruce Dawson | 2015-10-29 | 7 | -70/+72 |
| | | | | | | | | | | | | | | | | | | VC++ up to VS 2015 RTM does not require explicit storage allocation for static const integers declared in classes. VS 2015 Update 1 requires these storage definitions in some cases. It's unclear exactly what cases - simple tests work with and without the explicit storage allocation. Many previous versions of VC++ have theoretically *allowed* a definition to supply storage, but tests on VC++ 2013 show that this doesn't actually work correctly - it leads to duplicate definition errors in Chromium. So, the change is scoped to VS 2015 only. This change also updates the generated files to match the new generator. TL;DR - this change is necessary in order for Chromium to build with VS 2015 Update 1. | ||||
* | Merge pull request #861 from haberman/pywarnings | Joshua Haberman | 2015-10-28 | 13 | -139/+138 |
|\ | | | | | Removed all warnings from the Python/C++ build | ||||
| * | Pass $CC environment variable through tox. | Josh Haberman | 2015-10-28 | 1 | -0/+1 |
| | | |||||
| * | Special-case Clang-only warning flags to Clang. | Josh Haberman | 2015-10-28 | 2 | -4/+4 |
| | | |||||
| * | Disable some more warnings to be warnings-free. | Josh Haberman | 2015-10-28 | 1 | -1/+2 |
| | | |||||
| * | Fixed compile errors after rebase. | Josh Haberman | 2015-10-28 | 1 | -3/+1 |
| | | |||||
| * | Removed all warnings from the Python/C++ build. | Josh Haberman | 2015-10-28 | 13 | -134/+133 |
|/ | | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037 | ||||
* | Merge pull request #915 from pherl/masterv3.0.0-beta-1-bzl-fix | Jisi Liu | 2015-10-27 | 2 | -1/+16 |
|\ | | | | | add default_runtime attribute to cc|py rules. | ||||
| * | add default_runtime attribute to cc|py rules. | Jisi Liu | 2015-10-27 | 2 | -1/+16 |
|/ | | | | This adds implicit dependencies to the coressponding runtime libraries. | ||||
* | Merge pull request #908 from jskeet/oneof-equality | Jan Tattermusch | 2015-10-24 | 8 | -81/+151 |
|\ | | | | | Use oneof case in equality tests | ||||
| * | Generated code for previous commit (oneof case contributing to hash code and ↵ | Jon Skeet | 2015-10-24 | 6 | -81/+133 |
| | | | | | | | | equality). | ||||
| * | Include the oneof-case in equality and hash code generated code. | Jon Skeet | 2015-10-24 | 2 | -0/+18 |
| | | | | | | | | The included C# test will fail until the regenerated code is used, which is in the next commit. | ||||
* | | Merge pull request #904 from matthew-wu/master | Jisi Liu | 2015-10-23 | 1 | -1/+1 |
|\ \ | |/ |/| | Change the #include for any.h to use angle brackets instead of quotes | ||||
| * | Change the #include for any.h to use angle brackets instead of quotes, to be ↵ | Matthew Wu | 2015-10-22 | 1 | -1/+1 |
|/ | | | | consistent with other protobuf library includes. | ||||
* | Merge pull request #903 from pherl/bazel_test | Jisi Liu | 2015-10-22 | 3 | -7/+39 |
|\ | | | | | Enable python bazel tests and explicit list python dependencies. | ||||
| * | Update comments. | Jisi Liu | 2015-10-22 | 1 | -3/+4 |
| | | |||||
| * | fix six package path. | Jisi Liu | 2015-10-22 | 2 | -2/+8 |
| | | | | | | | | --strip_prefix doesn't seem to work. | ||||
| * | Add six as an external dep. | Jisi Liu | 2015-10-22 | 3 | -0/+19 |
| | | |||||
| * | Enable python tests with testdata. | Jisi Liu | 2015-10-22 | 1 | -4/+10 |
| | | |||||
* | | Merge pull request #901 from pherl/bazel_test | Jisi Liu | 2015-10-21 | 1 | -2/+4 |
|\| | | | | | Add runfiles to make the protobuf_test pass. | ||||
| * | Add runfiles to make the protobuf_test pass. | Jisi Liu | 2015-10-21 | 1 | -2/+4 |
|/ | |||||
* | Merge pull request #900 from pherl/rename | Jisi Liu | 2015-10-21 | 1 | -4/+4 |
|\ | | | | | Rename python and java bazel rules. | ||||
| * | Rename python and java bazel rules. | Jisi Liu | 2015-10-21 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #899 from pherl/cc_bazel | Jisi Liu | 2015-10-21 | 1 | -3/+3 |
|\ \ | |/ |/| | Use && for internal_copied_filegroup. | ||||
| * | Use && for internal_copied_filegroup. | Jisi Liu | 2015-10-21 | 1 | -3/+3 |
|/ | | | | So that the rule fails if one or more files cannot be copied. | ||||
* | Merge pull request #867 from pherl/master | Jisi Liu | 2015-10-21 | 2 | -46/+299 |
|\ | | | | | Python bazel support | ||||
| * | avoid name duplication. | Jisi Liu | 2015-10-20 | 1 | -1/+1 |
| | | |||||
| * | Rename copeid_src to internal_copied_filegroup | Jisi Liu | 2015-10-20 | 2 | -10/+10 |
| | | |||||
| * | Uncomment objc tests | Jisi Liu | 2015-10-20 | 1 | -7/+9 |
| | | |||||
| * | fix sources for python target and add needed dependencies. | Jisi Liu | 2015-10-20 | 1 | -3/+3 |
| | | |||||
| * | Change the impl rule include to includes. | Jisi Liu | 2015-10-20 | 2 | -19/+29 |
| | | | | | | | | | | We need to use the list to indicate field presense. The field must only contain 0 or 1 string element. | ||||
| * | Change default value of protoc on xx_proto_library rules. | Jisi Liu | 2015-10-20 | 2 | -4/+14 |
| | | |||||
| * | Support python for bazel. | Jisi Liu | 2015-10-19 | 2 | -3/+54 |
| | | |||||
| * | Python bazel support. | Jisi Liu | 2015-10-19 | 2 | -34/+214 |
| | | |||||
* | | Merge pull request #869 from anandolee/master | Jie Luo | 2015-10-20 | 4 | -11/+27 |
|\ \ | | | | | | | fix json_format for python2.6: | ||||
| * | | fix json_format for python2.6: | Jie Luo | 2015-10-19 | 4 | -11/+27 |
| | | | | | | | | | | | | | | | 1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6 2, total_seconds is not suppoted in python2.6, changed to compute seconds directly | ||||
* | | | Merge pull request #892 from pherl/cc_bazel | Jisi Liu | 2015-10-19 | 1 | -2/+8 |
|\ \ \ | | |/ | |/| | Allow include to be None. | ||||
| * | | Allow include to be None. | Jisi Liu | 2015-10-19 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the use case where all the paths are relative to the workspace root, e.g. foo/bar/BUILD /foo.proto -- package foo.bar would generate the message correctly. | ||||
* | | | Merge pull request #889 from leif81/patch-1 | Feng Xiao | 2015-10-16 | 1 | -10/+10 |
|\ \ \ | | | | | | | | | Fix typos in cmake README.md | ||||
| * | | | Change back to "protobuf_BUILD_TESTS" flag | Leif Gruenwoldt | 2015-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | In anticipation of PR #753 getting merged we'll change this back. However until that PR gets merged the old value "BUILD_TESTS" is really needed. | ||||
| * | | | Fix typos in cmake README.md | Leif Gruenwoldt | 2015-10-16 | 1 | -11/+11 |
| | | | | |||||
* | | | | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 | 8 | -57/+116 |
|\ \ \ \ | | | | | | | | | | | Improved CMake project | ||||
| * | | | | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 | 6 | -29/+50 |
| | | | | | |||||
| * | | | | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 | 4 | -3/+8 |
| | | | | | |||||
| * | | | | Simplify testing from CMake project to "check" target | Konstantin Podsvirov | 2015-09-17 | 2 | -25/+17 |
| | | | | | |||||
| * | | | | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-16 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Build tests optimization Now lite-test added to CTest collection | ||||
| * | | | | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS | Konstantin Podsvirov | 2015-09-15 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Rename CMake option ZLIB to protobuf_WITH_ZLIB | Konstantin Podsvirov | 2015-09-15 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS | Konstantin Podsvirov | 2015-09-15 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-15 | 2 | -3/+17 |
| | | | | |