aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix up the conformance testsThomas Van Lenten2016-01-053-108/+16
| | | | | - Update all the new runner cases to handle a skip result as a skip and not a failure. - Make ObjC use the new serialize_error result if it fails to generate the data.
* Merge pull request #1093 from thomasvl/fix_objcThomas Van Lenten2016-01-051-0/+13
|\ | | | | Update objectivec/google/protobuf/Type.pbobjc.m
| * Update objectivec/google/protobuf/Type.pbobjc.mThomas Van Lenten2016-01-051-0/+13
|/ | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have updated the generated .pbobjc.h but not the .pbobjc.m to match.
* Merge pull request #1092 from thomasvl/fix_conformanceThomas Van Lenten2016-01-051-3/+0
|\ | | | | Fix conformance test to only report skips in verbose mode.
| * Fix conformance test to only report skips in verbose mode.Thomas Van Lenten2016-01-051-3/+0
|/ | | | | | | commit e841bac4fcf47f809e089a70d5f84ac37b3883df seems to have mis-merged the change to reporting skipped tests. I didn't check if there were other merge issues.
* Merge pull request #1091 from thomasvl/objc_tests_use_autocreatorsThomas Van Lenten2016-01-054-13/+1
|\ | | | | Have the tests rely on the autocreator behaviors.
| * Have the tests rely on the autocreator behaviors.Thomas Van Lenten2016-01-054-13/+1
|/ | | | | Incase developers look at the tests for examples, have them rely on the autocreators also.
* Merge pull request #1085 from jskeet/fix-generationJon Skeet2016-01-052-125/+1301
|\ | | | | Fix C# source generation shell script and remove out of date notes
| * Fix C# source generation shell script and remove out of date notesJon Skeet2016-01-042-125/+1301
|/ | | | | The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path. The notes around "fix-ups" have been out of date for some time now.
* Merge pull request #1081 from haberman/fix-py3Joshua Haberman2015-12-313-91/+152
|\ | | | | Fixes for Python 3.
| * Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
|/
* Add changelog for v3.0.0-beta-2.v3.0.0-beta-2Feng Xiao2015-12-301-0/+61
| | | | | | [skip ci] Change-Id: Id383944dd3c999ad1008345ef34c9bdae24abc7c
* Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
|
* Require six>=1.9 for Python.Feng Xiao2015-12-292-2/+2
| | | | | | | | | We use six sub-modules that aren't available in old versions. Not specifying this requirement in the setup will lead to much less readable runtime errors. It's particuarlly problematic for Mac OSX users because the system comes with an old six version 1.4.1 by default. [skip ci]
* Update BUILD/cmake files.Feng Xiao2015-12-283-3/+9
| | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
* Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
| | | | Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d
* Add js to post_process_dist.sh.Feng Xiao2015-12-281-1/+1
| | | | Change-Id: I1ee87c49481bcc545939745ccf0a53d766a01a4c
* Fix a compiler warning.Feng Xiao2015-12-281-0/+2
| | | | Change-Id: I4c4e2a4a248e4336fef735f75ff5648d8d33627e
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-2810-279/+83
| | | | Also delete some unused files.
* Merge pull request #1071 from haberman/js-testsFeng Xiao2015-12-288-1/+135
|\ | | | | Enabled JavaScript tests and added README.md.
| * Fixed test command for JS tests.Josh Haberman2015-12-281-1/+1
| |
| * Fixed version number and testing command.Josh Haberman2015-12-221-2/+2
| |
| * Added README and enabled JavaScript tests on Node.jsJosh Haberman2015-12-218-1/+135
|/
* Disable python conformnace tests as well.Feng Xiao2015-12-211-2/+4
| | | | | | The testee program crashes on some inputs. Change-Id: Iab27b80e29b7a56c5bd7cb4724531ecf9bb2823a
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
| | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0
* Disable conformance tests for csharp and ruby.Feng Xiao2015-12-212-4/+8
| | | | The testee program of these two languages crashes on some test input.
* Update version numbers.Feng Xiao2015-12-214-4/+4
| | | | | Version number for beta languages is updated to v3.0.0-beta-2. Version number for alpha languages is updated to v3.0.0-alpha-5.
* Build Java conformance tests for JDK7 only.Feng Xiao2015-12-211-1/+9
| | | | | | The Java conformance test class uses JDK7+ only syntaxes and can't compile with JDK6. [skip ci]
* Exclude failing objc conformance tests.Feng Xiao2015-12-211-1/+107
| | | | [skip ci]
* Only try to install GCC 4.8 on Linux.Feng Xiao2015-12-211-6/+8
|
* Fix Java travis tests.Feng Xiao2015-12-213-6/+8
|
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-2142-1055/+404
|\
| * Merge pull request #1062 from rinatz/masterFeng Xiao2015-12-181-3/+28
| |\ | | | | | | Fix static non-pod type problem with dlopen
| | * Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| | |
| | * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
| | |
| * | Merge pull request #1059 from jtattermusch/add_refgen_dependencyJan Tattermusch2015-12-172-0/+14
| |\ \ | | | | | | | | Add reference generator dependency
| | * | add reference generator dependencyJan Tattermusch2015-12-172-0/+14
| | | |
| * | | Merge pull request #1060 from thomasvl/drop_spinlocksThomas Van Lenten2015-12-1711-874/+53
| |\ \ \ | | | | | | | | | | Drop all use of OSSpinLock
| | * | | Drop all use of OSSpinLockThomas Van Lenten2015-12-1711-874/+53
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple engineers have pointed out that OSSpinLocks are vulnerable to live locking on iOS in cases of priority inversion: . http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/ . https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html - Use a dispatch_semaphore_t within the extension registry. - Use a dispatch_semaphore_t for protecting autocreation within messages. - Drop the custom/internal GPBString class since we don't have really good numbers to judge the locking replacements and it isn't required. We can always bring it back with real data in the future.
| * | | Merge pull request #1052 from tswast/masterFeng Xiao2015-12-173-22/+53
| |\ \ \ | | |/ / | |/| | Add region tags to the Go protobuf examples.
| | * | Improves readability of Go example test.Tim Swast2015-12-161-25/+5
| | | |
| | * | Add region tags to the Go protobuf examples.Tim Swast2015-12-153-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to like to specific snippets of code in the documentation. I plan to create a tutorial similar to the C# tutorial https://developers.google.com/protocol-buffers/docs/csharptutorial Since that tutorial has sections for populating a proto, parsing, and serializing, I made a region for each of these for Go. To make the populating sample more self-contained, I refactor the listing example slightly.
| * | | Merge pull request #1049 from jskeet/any-formatJon Skeet2015-12-1722-118/+192
| |\ \ \ | | | | | | | | | | Handle Any formatting for diagnostic purposes
| | * | | Generated code changes from previous commit.Jon Skeet2015-12-1519-114/+117
| | | | |
| | * | | Make ToString() valid without a type registryJon Skeet2015-12-153-4/+75
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses issue #1008, by creating a JsonFormatter which is private and only different to JsonFormatter.Default in terms of reference equality. Other plausible designs: - The same, but expose the diagnostic-only formatter - Add something to settings to say "I don't have a type registry at all" - Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed) Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any. Generated code changes follow in the next commit.
| * | | Merge pull request #1051 from jtattermusch/support_coreclrJan Tattermusch2015-12-161-19/+38
| |\ \ \ | | | | | | | | | | Make nuget package support coreCLR
| | * | | make nuget package support CoreCLRJan Tattermusch2015-12-161-19/+38
| | |/ /
| * | | Merge pull request #1026 from jskeet/any-conformanceJan Tattermusch2015-12-161-19/+24
| |\ \ \ | | |/ / | |/| | Add JSON parsing to conformance tests.
| | * | Add JSON parsing to conformance tests.Jon Skeet2015-12-161-19/+24
| |/ /
| * | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagFeng Xiao2015-12-121-0/+2
| |\ \ | | | | | | | | MSVC MP flag to build with multiple processes in visual studio.