aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added Ruby to conformance tests.Josh Haberman2015-07-1616-575/+678
| | | | | | | | | | | | | This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
* Merge pull request #591 from pherl/fixbuildJisi Liu2015-07-131-1/+0
|\ | | | | remove pbconfig from extract script
| * remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
|/ | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
* Merge pull request #588 from haberman/conformance-jsonJoshua Haberman2015-07-136-52/+263
|\ | | | | Added support for JSON and valid input to conformance tests.
| * Added support for Json and valid input to conformance tests.Josh Haberman2015-07-106-52/+263
|/ | | | | | | | | | | | | | | | | | | | | | | | | This was enabled by the recent open-sourcing of JSON support and MessageDifferencer. MessageDifferencer allows the conformance suite to expand because it allows us to write tests for payloads that parse successfully. To verify the testee's output payload, we need to parse it back into a message and compare the message instances. Comparing output bytes vs. a golden message is *not* valid, because protobufs do not have a canonical encoding (especially in the presence of maps, which have no prescribed serialization order). We only add one small JSON test for now, but with the framework in place we now have the foundation to dramatically expand the coverage of the conformance test suite. Also added the ability for the testee to skip tests that exercise features that are unimplemented. This allows Java (which currently has no JSON support) to skip tests involving JSON. Change-Id: I697b4363da432b61ae3b638b4287c4cda1af4deb
* Merge pull request #570 from google/internal-third-partyPaul Yang2015-07-0911-158/+167
|\ | | | | Internal local modifications.
| * Internal local modifications.Bo Yang2015-07-0911-158/+167
|/
* Merge pull request #575 from haberman/rbleakJoshua Haberman2015-07-081-1/+13
|\ | | | | Worked around memory leak bug in Ruby interpreter.
| * Worked around memory leak bug in Ruby interpreter.Josh Haberman2015-07-081-1/+13
|/ | | | | Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f Fixes: https://github.com/google/protobuf/issues/474.
* Merge pull request #554 from jcanizales/proto-objc-bazelPaul Yang2015-07-063-35/+50
|\ | | | | Add Bazel target for the Objective-C protobuf runtime
| * Add Bazel target for protobuf ObjC runtimeJorge Canizales2015-07-063-35/+50
| | | | | | | | | | Also add WKT headers to the umbrella file, and simplify Podspec with it. Plus some layout improvements to the BUILD file.
* | Merge pull request #500 from TeBoring/tempPaul Yang2015-07-013-62/+94
|\ \ | | | | | | Implement parsing for proto3 primitive repeated fields.
| * | Implement parsing for proto3 primitive repeated fields. Previously, forBo Yang2015-06-153-62/+94
| | | | | | | | | | | | | | | proto3 primitive repeated fields, packed data cannot be parsed if definition is unpacked. Neither is the other way.
* | | Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
|\ \ \ | | | | | | | | MinGW64+MSYS2 compilation issues
| * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| | |/ | |/|
* | | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
|\ \ \ | | | | | | | | Delete default UnknownFieldSet when shuting down.
| * | | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
| | | |
* | | | Merge pull request #556 from mgiuca/fix-clang-warningFeng Xiao2015-06-301-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix "sometimes-uninitialized" warning on Windows Clang.
| * | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
|/ / /
* | | Merge pull request #540 from pherl/clean-warningsJisi Liu2015-06-253-11/+6
|\ \ \ | | | | | | | | fix compiler warnings.
| * | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
* | | | Merge pull request #512 from pherl/bazelPaul Yang2015-06-244-77/+140
|\ \ \ \ | | | | | | | | | | Enable tests for bazel build.
| * | | | Enable tests for bazel build.Jisi Liu2015-06-184-77/+140
| | | | | | | | | | | | | | | | | | | | Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
* | | | | Merge pull request #538 from google/jtattermusch-patch-1Jisi Liu2015-06-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | fix typo in cmake/README.md
| * | | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
|/ / / /
* | | | Merge pull request #530 from haberman/updateupbJoshua Haberman2015-06-232-19/+54
|\ \ \ \ | | | | | | | | | | Update upb to fix two bugs in the Ruby library.
| * | | | Update upb to fix two bugs in the Ruby library.Josh Haberman2015-06-222-19/+54
|/ / / / | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/502 https://github.com/google/protobuf/issues/425
* | | | Fix appveyor tests.Feng Xiao2015-06-221-2/+2
| | | |
* | | | Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-1930-274/+366
|\ \ \ \ | |/ / / |/| | | Add nonnull/nullable/null_resettable markup to ObjC library.
| * | | Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-1630-274/+366
| | |/ | |/| | | | | | | Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
* | | Merge pull request #510 from pherl/bazelJisi Liu2015-06-182-95/+2
|\ \ \ | | | | | | | | Remove OUTS constants in BUILD
| * | | Remove OUTS constants in BUILDJisi Liu2015-06-182-95/+2
|/ / / | | | | | | | | | | | | | | | | | | Induce those from the input proto file names instead to reduce the lenght of the BUILD file. Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
* | | Merge pull request #509 from pherl/update_BUILDJisi Liu2015-06-181-2/+65
|\ \ \ | | | | | | | | Update BUILD for the recent json util change.
| * | | Update BUILD for the recent json util change.Jisi Liu2015-06-181-2/+65
|/ / / | | | | | | | | | Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
* | | Merge pull request #508 from pherl/nanfixJisi Liu2015-06-181-1/+1
|\ \ \ | | | | | | | | using ::isnan to avoid conflicts with std::isnan for C++11 build.
| * | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
|/ / / | | | | | | | | | Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
* | | Fix distcheck.Jisi Liu2015-06-181-1/+1
| | | | | | | | | | | | Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
* | | Merge pull request #505 from pherl/bazelJisi Liu2015-06-185-122/+593
|\ \ \ | | | | | | | | Add bazel support for the project
| * | | Remove redundant includeJisi Liu2015-06-181-1/+0
| | | | | | | | | | | | | | | | Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
| * | | Add Bazel BUILD for the project.Jisi Liu2015-06-173-49/+524
| | | | | | | | | | | | | | | | Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
| * | | Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-6/+4
| | | | | | | | | | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-17103-207/+28289
|\ \ \ \ | |/ / / |/| | | Down-integrate from internal code base.
| * | | Fix broken builds.Feng Xiao2015-06-1732-136/+190
| | | |
| * | | Down-integrate from internal code base.Feng Xiao2015-06-15101-198/+28226
| |/ / | | | | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* | | Merge pull request #497 from pherl/config_hJisi Liu2015-06-1613-156/+23
|\ \ \ | |/ / |/| | Check HAVE_CONFIG_H before including "config.h"
| * | Make the code independent of config.hJisi Liu2015-06-1613-156/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #499 from xfxyjwf/appveyorFeng Xiao2015-06-151-1/+1
|\ \ | | | | | | Add a badge for AppVeyor build.
| * | Add a badge for AppVeyor build.Feng Xiao2015-06-151-1/+1
| | | | | | | | | | | | Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
* | | Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
|\ \ \ | |/ / |/| | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
| * | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 20:44:21 +0000