aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Makes _PackagePrivate.h files privateJorge Canizales2015-05-141-2/+2
|
* Adds the initial version of the podspec for the proto3 Objective-C runtime.Jorge Canizales2015-05-141-0/+23
|
* Merge branch 'gerrit'Feng Xiao2015-05-1324-19/+15705
|\
| * Include generated code of well-known types in protobuf C++ runtime.Feng Xiao2015-05-1124-19/+15705
| | | | | | | | Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c
* | Merge pull request #383 from cfallin/ruby-travisChris Fallin2015-05-134-3/+33
|\ \ | | | | | | Add Ruby to Travis testing
| * | Added Ruby to Travis testing.Chris Fallin2015-05-134-3/+33
|/ / | | | | | | | | | | | | | | | | - Added RVM-based Ruby test driver that tests MRI and JRuby. - Fixed JRuby compilation (at least in my current setup): force source version to 1.6 (Java 6) to allow generics and annotations. - Modify the skipped JRuby JSON tests so that the exit code is 0 (skip() results in a failing exit code from `rake test`). An upcoming PR should fix JSON under JRuby in general soon.
* | Merge pull request #371 from zhangkun83/dockerJisi Liu2015-05-122-1/+60
|\ \ | | | | | | Dockerfile for building protoc on Centos 6.6
| * | Dockerfile for building protoc on Centos 6.6Kun Zhang2015-05-122-1/+60
| | |
* | | Merge pull request #369 from ensonic/masterFeng Xiao2015-05-122-6/+2
|\ \ \ | |/ / |/| | Uncomment conflict fields from pkg-config files.
| * | Uncomment conflict fields from pkg-config files.Stefan Sauer2015-05-122-6/+2
|/ / | | | | | | | | The referenced bug was fixed in 2007 and has been released in pkg-config-0.23 (16.Jan.2008). The fixed version is widely available.
* | Merge pull request #255 from btabibian/masterJoshua Haberman2015-05-071-1/+1
|\ \ | |/ |/| adding globals() to exec call for python3 compatibility
| * mendBehzad Tabibian2015-05-071-1/+1
| |
| * adding globals() to exec call for python3 compatibilityBehzad Tabibian2015-04-281-1/+1
| |
* | Merge branch 'gerrit' to 'master'Feng Xiao2015-05-0713-15/+265
|\ \
| * | Modify directory to use in testBo Yang2015-04-272-0/+10
| | | | | | | | | | | | Change-Id: Iede1dc4e70427663e0d3c5304fa86b3aebf492b7
| * | Handle un-handled cases of TestOneof2 in unittestBo Yang2015-04-271-0/+9
| | | | | | | | | | | | Change-Id: I8f082ee3117ed873ab472a539867ff7cae58e8fd
| * | internal changesBo Yang2015-04-2410-15/+246
| | | | | | | | | | | | Change-Id: I66f216c70a19f44637090878d7e442d4d0f8991b
* | | Merge pull request #345 from brianduff/update_aosp_againJisi Liu2015-05-071-0/+2
|\ \ \ | | | | | | | | Handle 0-length byte buffers in micro and nano protobufs
| * | | Handle 0-length byte buffers in micro and nano protobufsAndre Eisenbach2015-05-041-0/+2
| | | | | | | | | | | | | | | | Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
* | | | Merge pull request #101 from fizbin/fix_large_proto_java_codeFeng Xiao2015-05-075-26/+116
|\ \ \ \ | | | | | | | | | | Fix java compilation issues when processing large .proto files
| * | | | More 'int' return value documentationDaniel Martin2015-04-091-1/+5
| | | | |
| * | | | CR feedback: spacing, document return valuesDaniel Martin2015-04-082-1/+5
| | | | |
| * | | | Fix java compilation issues when processing large .proto filesDaniel Martin2014-11-255-25/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues 579 and 501 on the code.google.com issues list. Specifically, large .proto files lead to too much static code, leading to a compilation error from javac: "code too large". This divides the code used in static initialization into multiple methods to avoid that error. Also, this incorporates the fix in issue 501 on the code.google.com issues list to call registry.add only once per extension.
* | | | | Merge pull request #349 from haberman/conformance-java-travisJoshua Haberman2015-05-062-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Run conformance tests against Java for the Travis build.
| * | | | | Run conformance tests against Java for the Travis build.Josh Haberman2015-05-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ef8664f7facf86028be3f4f0d5d2efc8a685d6d
* | | | | | Merge pull request #331 from thomasvl/objc_alpha1_dropPaul Yang2015-05-06165-3/+82460
|\ \ \ \ \ \ | | | | | | | | | | | | | | Objective C compiler plugin and runtime
| * | | | | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-06165-3/+82460
| | | | | | |
* | | | | | | Merge pull request #281 from tamird/cleanup-setup-pyJoshua Haberman2015-05-0621-106/+114
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Cleanup setup.py
| * | | | | | Noramlize 'setup.py' to fit conventions:Tamir Duberstein2015-05-062-86/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Comply with flake8, except for indentation width, which is 2. - Move human-centric metadata to top of 'setup()' call. - Add Trove classifiers for supported Python versions. - Use 'find_packages()' + MANIFEST.in to avoid errors in listing modules and packages. Closes #131 and #161.
| * | | | | | [PYTHON] gitignore eggsTamir Duberstein2015-05-061-0/+1
| | | | | | |
| * | | | | | WhitespaceTamir Duberstein2015-05-061-1/+1
| | | | | | |
| * | | | | | Don't hard-code the python pathTamir Duberstein2015-05-0619-19/+19
|/ / / / / /
* | | | | | Merge Gerrit master into GitHub master.Josh Haberman2015-05-064-11/+145
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | Adds conformance test support for Java.
| * | | | | Added conformance test support for Java.Josh Haberman2015-04-164-11/+145
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c81808e6ace77d2b5737a43417045321b0b10f0
* | | | | | Merge pull request #334 from skippy/allow-msg-to-accept-nilChris Fallin2015-05-023-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | ruby: allow a message field to be unset
| * | | | | | allow a message field to be unsetAdam Greene2015-05-024-7/+16
| | | | | | |
* | | | | | | Merge pull request #332 from skippy/nil-out-of-boundsChris Fallin2015-05-027-26/+85
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | ruby: return nil for out of bounds
| * | | | | | return nil if array index indicie is out of boundsAdam Greene2015-05-017-26/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby arrays don't throw an exception; they return nil. Lets do the same! this fix also includes the ability to use negative array indicies
* | | | | | | Merge pull request #328 from skippy/add-sizeChris Fallin2015-05-015-3/+57
|\| | | | | | | | | | | | | | | | | | | | ruby: Add size to RepeatField
| * | | | | | add size alias for lengthAdam Greene2015-05-015-3/+57
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting to make `RepeatedField` quack like an array additional changes: * make sure gemspec gets all ruby code files * add homepage in gem spec removes one of the warnings, and the gem spec authors are pushing everyone to include a homepage in the gem * remove excess whitespace in test suite to bring formatting inline with the rest of the file
* | | | | | Merge pull request #327 from skippy/build-cleanupChris Fallin2015-05-013-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | ruby: build cleanups
| * | | | | | build cleanupsAdam Greene2015-05-013-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update docs to simplify build steps * Gemfile.lock seemed to have an older version specified * do not check in the pkg dir
* | | | | | Merge pull request #325 from TeBoring/masterJisi Liu2015-04-301-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Generate pbconfig.h in generate_descriptor_proto.sh
| * | | | | Generate pbconfig.h in generate_descriptor_proto.shBo Yang2015-04-301-0/+1
|/ / / / /
* | | | | Merge pull request #315 from brianduff/sync_from_aospJisi Liu2015-04-2926-90/+703
|\ \ \ \ \ | | | | | | | | | | | | Sync nanoproto from AOSP
| * | | | | Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less ideal from a dex count perspective because it requires a new variable for each message, and because most apps have proguard rules that will ensure that CREATOR classes are retained. However, it is required to be able to use nano protos inside of AIDL files, as the autogenerated AIDL code fails to compile otherwise. This is a substantial benefit as it allows for backwards-compatible parameters and return types in AIDL methods along the lines of safeparcel. Bug: 19084705 Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
| * | | | | Throw OutOfSpaceException instead of IllegalArgumentException.Charles Munger2015-04-282-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a MessageNano containing a String is serialized into a buffer that is too small to contain it, and the buffer's boundary happens to be where the string field's length delimiting varint is serialized, and the string's length and 3*length have the same length when encoded as a varint, an IllegalArgumentException is thrown rather than an OutOfSpaceException. Github issue: https://github.com/google/protobuf/issues/292 Change-Id: If478d68cf15bfd0662252d008e42b2bf1ff1c75e
| * | | | | Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-283-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out dex (apparently) was inlining these protected final methods from ExtendableMessageNano into every message class. Removing these methods from the base class and inlining their code reduces the method count by 2 methods / message when the store_unknown_fields option is on. Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
| * | | | | Expose generate_clear as an option.Brian Duff2015-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wasn't able to get the clear() method to inline into the constructor when optimizations are on in proguard. As a result, every message has an extra superfluous kept method assuming the app never uses clear() directly. There are a couple of instances where setting this option false is necessary in order to get code dexing successfully without hitting the method limit, e.g. https://goto.google.com/tltzq In this example, I tried turning on the method/inlining/unique and method/inlining/short optimizations before resorting to adding the generate_clear option, but the method count did not decrease. The clear() methods were contributing over a thousand extra methods. Change-Id: If6a9651d6a59cdf70b1040d8248779710ac73105
| * | | | | Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-04-285-9/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @IntDef is a support library annotation which allows build tools to determine the valid set of values for a given integer field when that field is intended to be restricted like an enum. This avoids the overhead of enums while still allowing for compile-time type checking in most circumstances. Change-Id: Iee02e0b49a8e069f6456572f538e0a0d301fdfd5
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 15:01:24 +0000