aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Build protoc for host platform to enable cross-compilation.Andrew Harp2015-11-031-0/+1
| | | This is necessary to run protoc on the host as a dependency for Android BUILD targets with Bazel.
* Merge pull request #930 from pherl/bazel_testJisi Liu2015-11-021-0/+8
|\ | | | | add warning notes for cc|py_proto_library rules.
| * add warning notes for cc|py_proto_library rules.Jisi Liu2015-11-021-0/+8
| | | | | | | | | | To mention that the interface may change or be removed when bazel has support it natively.
* | Merge pull request #931 from xfxyjwf/fix_compileFeng Xiao2015-11-023-3/+4
|\ \ | |/ |/| Fix compilation errors when built internally.
| * Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
|/ | | | | | | | 1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
* Merge pull request #929 from jskeet/unsafe-internalJan Tattermusch2015-11-021-3/+3
|\ | | | | Make BytesString.Unsafe internal (which it should have been all along)
| * Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
| |
* | Merge pull request #924 from bbarenblat/masterFeng Xiao2015-10-317-7/+7
|\ \ | |/ |/| Correct spelling
| * Correct spellingBenjamin Barenblat2015-10-307-7/+7
|/
* Merge pull request #905 from jskeet/wrapper-clearJan Tattermusch2015-10-303-2/+12
|\ | | | | Fix clearing wrapper type fields with reflection.
| * Fix clearing wrapper type fields with reflection.Jon Skeet2015-10-303-2/+12
|/ | | | The nullable value type fields already worked, but the use of the CLR property concealed the difference between string and StringWrapper fields.
* Merge pull request #922 from randomascii/masterFeng Xiao2015-10-297-70/+72
|\ | | | | Get VS 2015 to use const int definitions
| * Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-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/pywarningsJoshua Haberman2015-10-2813-139/+138
|\ | | | | Removed all warnings from the Python/C++ build
| * Pass $CC environment variable through tox.Josh Haberman2015-10-281-0/+1
| |
| * Special-case Clang-only warning flags to Clang.Josh Haberman2015-10-282-4/+4
| |
| * Disable some more warnings to be warnings-free.Josh Haberman2015-10-281-1/+2
| |
| * Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
| |
| * Removed all warnings from the Python/C++ build.Josh Haberman2015-10-2813-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-fixJisi Liu2015-10-272-1/+16
|\ | | | | add default_runtime attribute to cc|py rules.
| * add default_runtime attribute to cc|py rules.Jisi Liu2015-10-272-1/+16
|/ | | | This adds implicit dependencies to the coressponding runtime libraries.
* Merge pull request #908 from jskeet/oneof-equalityJan Tattermusch2015-10-248-81/+151
|\ | | | | Use oneof case in equality tests
| * Generated code for previous commit (oneof case contributing to hash code and ↵Jon Skeet2015-10-246-81/+133
| | | | | | | | equality).
| * Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-242-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/masterJisi Liu2015-10-231-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 Wu2015-10-221-1/+1
|/ | | | consistent with other protobuf library includes.
* Merge pull request #903 from pherl/bazel_testJisi Liu2015-10-223-7/+39
|\ | | | | Enable python bazel tests and explicit list python dependencies.
| * Update comments.Jisi Liu2015-10-221-3/+4
| |
| * fix six package path.Jisi Liu2015-10-222-2/+8
| | | | | | | | --strip_prefix doesn't seem to work.
| * Add six as an external dep.Jisi Liu2015-10-223-0/+19
| |
| * Enable python tests with testdata.Jisi Liu2015-10-221-4/+10
| |
* | Merge pull request #901 from pherl/bazel_testJisi Liu2015-10-211-2/+4
|\| | | | | Add runfiles to make the protobuf_test pass.
| * Add runfiles to make the protobuf_test pass.Jisi Liu2015-10-211-2/+4
|/
* Merge pull request #900 from pherl/renameJisi Liu2015-10-211-4/+4
|\ | | | | Rename python and java bazel rules.
| * Rename python and java bazel rules.Jisi Liu2015-10-211-4/+4
| |
* | Merge pull request #899 from pherl/cc_bazelJisi Liu2015-10-211-3/+3
|\ \ | |/ |/| Use && for internal_copied_filegroup.
| * Use && for internal_copied_filegroup.Jisi Liu2015-10-211-3/+3
|/ | | | So that the rule fails if one or more files cannot be copied.
* Merge pull request #867 from pherl/masterJisi Liu2015-10-212-46/+299
|\ | | | | Python bazel support
| * avoid name duplication.Jisi Liu2015-10-201-1/+1
| |
| * Rename copeid_src to internal_copied_filegroupJisi Liu2015-10-202-10/+10
| |
| * Uncomment objc testsJisi Liu2015-10-201-7/+9
| |
| * fix sources for python target and add needed dependencies.Jisi Liu2015-10-201-3/+3
| |
| * Change the impl rule include to includes.Jisi Liu2015-10-202-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 Liu2015-10-202-4/+14
| |
| * Support python for bazel.Jisi Liu2015-10-192-3/+54
| |
| * Python bazel support.Jisi Liu2015-10-192-34/+214
| |
* | Merge pull request #869 from anandolee/masterJie Luo2015-10-204-11/+27
|\ \ | | | | | | fix json_format for python2.6:
| * | fix json_format for python2.6:Jie Luo2015-10-194-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_bazelJisi Liu2015-10-191-2/+8
|\ \ \ | | |/ | |/| Allow include to be None.
| * | Allow include to be None.Jisi Liu2015-10-191-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.