aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Update README.md and remove INSTALL.txtFeng Xiao2016-01-061-1/+0
| | | | | | | | Added instructions on what tools to install to compile protobuf from source. Removed the INSTALL.txt file because it's just a simple copy of the autoconf documentation and confuses users. Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-2/+48
| | | | Also delete some unused files.
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-211-1/+0
|\
| * Drop all use of OSSpinLockThomas Van Lenten2015-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Add new files to Makefile.amFeng Xiao2015-12-141-24/+36
| |
* | Down-integrate from internal code base.Feng Xiao2015-12-111-4/+5
|/
* Fix dist_clean and maintainer-clean to get more generated files.Thomas Van Lenten2015-12-101-0/+1
|
* Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-191-1/+1
|\ | | | | Change the way the "umbrella class" (descriptors) is named/namespaced
| * Generated code changes and manual changes for previous commit.Jon Skeet2015-11-091-1/+1
| |
* | Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-161-0/+4
|/ | | | | | - Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir.
* Created a new exception for JSON failures.Jon Skeet2015-11-051-0/+1
| | | | | | This is only thrown directly by JsonTokenizer, but surfaces from JsonParser as well. I've added doc comments to hopefully make everything clear. The exception is actually thrown by the reader within JsonTokenizer, in anticipation of keeping track of the location within the document, but that change is not within this PR.
* Implement JSON parsing in C#.Jon Skeet2015-11-031-0/+5
| | | | | | | | | | This includes all the well-known types except Any. Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already. Note that the choice *not* to use Json.NET was made for two reasons: - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-0/+3
|\
| * Support enum forward decls in Objective C++Thomas Van Lenten2015-10-011-0/+1
| | | | | | | | | | | | NS_ENUM changes defintion in Objective C++ based on the C++ spec being compiled with, special case the one situation where it wouldn't support doing a forward decl for the enum.
| * Pack/Unpack implementation for Any.Jon Skeet2015-09-041-0/+2
| | | | | | | | | | We still need the JSON representation, which relies on something like a DescriptorPool to fetch message types from based on the type URL. That will come a bit later. (The DescriptorPool comment in this commit is just a note which will prove useful if we use DescriptorPool itself.)
* | Down-integrate from google internal.Jisi Liu2015-10-051-0/+2
|/
* Fix merge conflict.Feng Xiao2015-08-261-1/+0
|
* Merge pull request #756 from TeBoring/beta-1Feng Xiao2015-08-261-0/+1
|\ | | | | Add distribution for objc
| * Add distribution for objcBo Yang2015-08-261-0/+2
| |
* | Update Makefile.am to include missing files.Feng Xiao2015-08-261-11/+45
|\ \
| * | Add missing files in dist.Feng Xiao2015-08-261-1/+21
| | |
* | | Add bazel build/workspace into distribution.Jisi Liu2015-08-261-0/+3
| |/ |/| | | | | Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
* | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-1/+0
|\|
| * Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | Fix bugs on windowsBo Yang2015-08-251-27/+32
|/
* Remove a redundant layer of directory hierarchy.Jon Skeet2015-08-031-1/+1
|
* Update Makefile.amJan Tattermusch2015-08-021-2/+2
|
* Rename ThrowHelper to Preconditions and make it public - we'll want to use ↵Jon Skeet2015-07-301-1/+1
| | | | | | | it from the generated code soon. Additionally, change it to return the value passed, and make it generic with a class constraint. A separate method doesn't have the class constraint, for more unusual scenarios.
* remove the freeze APIJan Tattermusch2015-07-291-1/+0
|
* Fix typo in Makefile.amJon Skeet2015-07-221-1/+1
|
* Fix file lists for C#Jon Skeet2015-07-221-1/+1
|
* Updated csharp_EXTRA_DIST for TravisJon Skeet2015-07-171-89/+90
|
* updated csharp_EXTRA_DISTJan Tattermusch2015-07-161-248/+106
|
* Fix distcheck.Jisi Liu2015-06-181-1/+1
| | | | Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
* Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-171-13/+14
|\ | | | | Down-integrate from internal code base.
| * Down-integrate from internal code base.Feng Xiao2015-06-151-13/+14
| | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
* | Make the code independent of config.hJisi Liu2015-06-161-3/+0
|/ | | | | | | | | | | | | 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
* Remove the file from Makefile.amJisi Liu2015-06-131-1/+0
| | | | Change-Id: I2015df2409aa95401af658b40023c8f9b9d75068
* Update podspec for files that can build now, rename assets to not need @ in ↵Thomas Van Lenten2015-06-101-5/+5
| | | | the name.
* Merge pull request #480 from thomasvl/objc_beta_dropPaul Yang2015-06-091-12/+6
|\ | | | | Beta quality drop of Objective C Support.
| * Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-081-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add more to the ObjC dir readme. - Merge the ExtensionField and ExtensionDescriptor to reduce overhead. - Fix an initialization race. - Clean up the Xcode schemes. - Remove the class/enum filter. - Remove some forced inline that were bloating things without proof of performance wins. - Rename some internal types to avoid conflicts with the well know types protos. - Drop the use of ApplyFunctions to the compiler/optimizer can do what it wants. - Better document some possible future improvements. - Add missing support for parsing repeated primitive fields in packed or unpacked forms. - Improve -hash. - Add *Count for repeated and map<> fields to avoid auto create when checking for them being set.
* | Remove vsprojects.Feng Xiao2015-06-051-33/+31
|/
* Add new files to Makefile.amBo Yang2015-05-251-1/+32
|
* Add csharp_EXTRA_DIST to all_EXTRA_DIST.Bo Yang2015-05-251-1/+1
|
* Add new files for java runtime to Makefile.amTeBoring2015-05-251-0/+3
|
* Add csharp files to Makefile.amBo Yang2015-05-251-0/+249
|
* Add objectivec/generate_descriptors_proto.sh in Makefile.amBo Yang2015-05-251-0/+1
|
* Remove useless slash in Makefile.amTeBoring2015-05-251-22/+22
|
* Fix bugs in objective-c.Bo Yang2015-05-251-16/+33
|
* Merge pull request #410 from thomasvl/objc_alpha2_dropPaul Yang2015-05-221-2/+2
|\ | | | | Objective C Second Alpha Drop