aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1873 from pherl/javalitev3.0.0-javaliteJisi Liu2016-07-283-3/+5
|\ | | | | Fix Javalite Pom
| * Update maven to call the plugin to generate javalite code.Jisi Liu2016-07-282-1/+3
| |
| * update javalite versions.Jisi Liu2016-07-282-2/+2
|/
* Merge pull request #1872 from pherl/fixwin-javaliteJisi Liu2016-07-281-5/+3
|\ | | | | Fix build protoc script for windows
| * Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
|/
* Merge pull request #1856 from pherl/javaliteJisi Liu2016-07-263-4/+149
|\ | | | | Add protoc-gen-javalite pom file in javalite branch.
| * Change documentation for javalite releaseJisi Liu2016-07-261-4/+13
| |
| * Move the protoc pom to protoc-pom.xml in the lite.Jisi Liu2016-07-261-0/+0
| | | | | | | | This avoid accidental release the protoc using the lite branch.
| * Add a pom for javalite pluginJisi Liu2016-07-262-0/+136
| |
* | Merge pull request #1854 from pherl/javaliteJisi Liu2016-07-262-8/+22
|\| | | | | Cherry pick protoc-artifacts change into the javalite branch
| * fix comments.Jisi Liu2016-07-261-1/+1
| |
| * Fix the script comments.Jisi Liu2016-07-261-2/+2
| |
| * Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
|/
* Merge pull request #1840 from pherl/javaliteJisi Liu2016-07-251-0/+1
|\ | | | | Add lite plugin output to gitignore
| * Add lite plugin output to gitignoreJisi Liu2016-07-251-0/+1
| |
* | Merge pull request #1793 from pherl/javaliteJisi Liu2016-07-152-1/+38
|\| | | | | Add a javalite plugin.
| * Add a javalite plugin.Jisi Liu2016-07-152-1/+38
|/
* Move to dotnet cli for building, and .NET Core (netstandard1.0) as target ↵Jon Skeet2016-07-1443-818/+367
| | | | | | | platform (#1727) Move to dotnet cli for building, and .NET Core (netstandard1.0) as target platform This also updates the version number to 3.0.0-beta4
* Implement RepeatedField.AddRange (#1733)Jon Skeet2016-07-133-63/+171
| | | | | | | | | | | | | | | | | | | * Improve exception throwing implementation in collections * Implement RepeatedField.AddRange. This fixes issue #1730. * Optimize AddRange for sequences implementing ICollection (Also fix a few more C# 6-isms.) * Remove the overload for Add(RepeatedField<T>) We now just perform the optimization within AddRange itself. This is a breaking change in terms of "drop in the DLL", but is source compatible, which should be fine.
* Merge pull request #1778 from yeswalrus/fix-prerelease-versionFeng Xiao2016-07-121-1/+1
|\ | | | | Fix a <package>_FIND_VERSION_PRERELEASE being ignored
| * Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to ↵Walter Gray2016-07-121-1/+1
|/ | | | be ignored.
* Merge pull request #1776 from thomasvl/fix_distThomas Van Lenten2016-07-121-2/+0
|\ | | | | Remove the baseline files from the make dist file list.
| * Remove the baseline files from the make dist file list.Thomas Van Lenten2016-07-121-2/+0
|/ | | | | https://github.com/google/protobuf/pull/1762 remove the files, but I forgot to update Makefile.am to remove them.
* Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581)Jos Hickson2016-07-101-3/+1
|
* Merge pull request #1702 from lukebakken/csharp-nuget-doc-updateJon Skeet2016-07-101-2/+2
|\ | | | | Modify csharp README since there are now two NuGet packages
| * Modify csharp README since there are now two NuGet packagesLuke Bakken2016-06-221-2/+2
| |
* | Merge pull request #1764 from jskeet/remove-is-value-typeJon Skeet2016-07-093-35/+6
|\ \ | | | | | | Remove unnecessary reflection call
| * | Remove unnecessary reflection callJon Skeet2016-07-083-35/+6
| | | | | | | | | | | | | | | This is the only call to TypeExtensions.IsValueType, so we can remove that method, making the whole type conditionally compiled out for .NET 3.5
* | | Merge pull request #1762 from thomasvl/drop_perf_profilesThomas Van Lenten2016-07-082-83/+0
|\ \ \ | |/ / |/| | Drop the performace baselines.
| * | Drop the performace baselines.Thomas Van Lenten2016-07-082-83/+0
|/ / | | | | | | | | We weren't really using them, and the nested path causes checkout problems on windows.
* | Merge pull request #1757 from thomasvl/avoid_importing_srcThomas Van Lenten2016-07-076-14/+17
|\ \ | | | | | | Don't #import the .m files.
| * | Don't #import the .m files.Thomas Van Lenten2016-07-076-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | As bazel folks are looking at getting auto generation of module maps going and the importing of sources files causes issues there. We were only do it to hack around some of the apple linker behaviors around objc classes and categories, but even that isn't complete and CocoaPods was already doing -ObjC, and developers not using pods could have still needed it to ensure everything was linked anyways; so drop the hack of importing sources.
* | | Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0733-285/+2601
|\ \ \ | | | | | | | | Change placement of DebuggerNonUserCodeAttribute
| * | | Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | This does not affect the generated code. If we decide we want to apply attributes to generated types, we should start by just reverting this change.
| * | | Changes to generated code from previous commitJon Skeet2016-07-0420-244/+2537
| | | |
| * | | Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this has caught everything. I've left a stub for attributes to be applied to the types themselves, but we don't currently need anything. Follow-up commit will include the changes to generated code itself. Fixes #1671.
* | | | Merge pull request #1758 from dago/pathmax2Feng Xiao2016-07-071-2/+0
|\ \ \ \ | | | | | | | | | | Make sure also Solaris x86 gets PATH_MAX
| * | | | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
|/ / / /
* | | | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \ \ \ | | | | | | | | | | Fix problems detected when integrating the code to our internal repo.
| * | | | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| | | | |
| * | | | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| | |/ / | |/| |
* | | | Merge pull request #1742 from ottok/fix-spellingFeng Xiao2016-07-0640-68/+68
|\ \ \ \ | | | | | | | | | | Fix spelling
| * | | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
| | | | |
| * | | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0339-67/+67
| | |/ / | |/| |
* | | | Merge pull request #1752 from acozzette/fix-js-testsAdam Cozzette2016-07-063-2/+486
|\ \ \ \ | |_|/ / |/| | | Fixed failing JS tests
| * | | Fixed failing JS testsAdam Cozzette2016-07-063-2/+486
| | | | | | | | | | | | | | | | | | | | | | | | A couple of small tweaks were needed to fix test failures that were inadvertently introduced in the last down integration. I also had to add the map.js file which was missing.
* | | | Merge pull request #1712 from dkharrat/swift-error-handlingThomas Van Lenten2016-07-062-21/+21
|\ \ \ \ | |_|/ / |/| | | add nullable qualifier to return types that can be nil, to support Swift 2 try-catch syntax
| * | | add nullable qualifier to nil return typesDia Kharrat2016-07-052-21/+21
|/ / / | | | | | | | | | | | | | | | Add the `nullable` qualifier to return types of Objective-C methods that can return a nil due to errors. This change makes these methods compatible with the Swift 2 try-catch syntax.
* | | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \ \ | |/ / |/| | Add JsonParseOptions to ignore unknown fields
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
| | | | | | | | | | | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 04:33:51 +0000