aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4816 from hrsht/hrsht/zanker-proto2Joshua Haberman2018-09-271-0/+5
|\ | | | | Basic Proto2 support for Ruby gem
| * Adds support for proto2 syntax for Ruby gem.Harshit Chopra2018-09-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change only adds basic proto2 support without advanced features like extensions, custom options, maps, etc. The protoc binary now generates ruby code for proto2 syntax. However, for now, it is restricted to proto2 files without advanced features like extensions, in which case it still errors out. This change also modifies the DSL to add proto messages to the DescriptorPool. There is a new DSL Builder#add_file to create a new FileDescriptor. With this, the generated ruby DSL looks something like: Google::Protobuf::DescriptorPool.generated_pool.build do add_file "test.proto" do add_message "foo" do optional :val, :int32, 1 end end end
* | Ignore python .egg file to make git status clean #5004Yuzhang Hu2018-08-051-1/+1
| |
* | Added support for Visual Studio 2017 in gitignoremkosieradzki2018-07-221-0/+3
|/
* Remove js_embed binary. (#4709)Feng Xiao2018-06-011-1/+0
| | | | * Remove js_embed binary.
* Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-171-0/+1
| | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
* Add __init__.py files to compiler and util subpackages (#4117)Thomas Hisch2018-04-091-2/+0
| | | | | | The compiler and util subpackages are created by the build_py class in setup.py. This has caused an issue in the protobuf package in conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40), which is fixed by this commit.
* Updated .gitignore to exclude downloaded gmock/ directoryAdam Cozzette2018-03-271-1/+1
|
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-261-1/+9
| | | Add googletest as a submodule in third_party/googletest.
* Reserve unknown in Ruby (#3763)Paul Yang2017-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown in ruby * Revert ruby tests. Wait for cpp impl for conformance test * Add conformance test for preserving unknown * Add unknown field conformance test to csharp failure list. * Fix comments * Fix comment * Fix comments * Fix typo * Use stringsink_string directly * Mark hd unused * Remove unused encodeunknown_handlerfunc
* Fix ruby segment fault (#3708)Paul Yang2017-10-031-0/+5
| | | | | | | | | | | | | | | | * Fix ruby segment fault 1) rb_ary_new cannot be called during allocate function. During allocate fucntion, the containing object hasn't been marked and rb_ary_new may invoke gc to collect containing object. 2) The global map should be marked before allocating it. Otherwise it may be garbage collected. * Add test * Remove commented code * Fix grammer error
* update .gitignoreYilun Chong2017-06-281-0/+1
|
* revert .gitignoreYilun Chong2017-06-281-1/+0
|
* change ignoreYilun Chong2017-06-271-0/+1
|
* bazel: add bazel symlinks to .gitignoreJakob Buchgraber2017-06-161-0/+3
|
* Add compatibility test for php. (#3041)Paul Yang2017-05-051-0/+2
| | | | | | * Add compatibility test for php. * Revert API incompatible change.
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-0/+3
|\
| * Make PHP c extension work with PHP7 (#2951)Paul Yang2017-04-191-0/+3
| |
* | Merge pull request #2930 from anuraaga/dev_ragAdam Cozzette2017-04-041-0/+2
|\ \ | | | | | | Fix error message for int64 parse failure.
| * | Add IntelliJ project to gitignore for java project.Anuraag Agrawal2017-04-031-0/+2
| | |
* | | Added compatibility tests for version 3.0.0Adam Cozzette2017-04-031-1/+8
| |/ |/|
* | Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
|/
* Add conformance test for php (#2655)Paul Yang2017-02-011-0/+6
|
* Auto-generate well_known_types_embed.ccAdam Cozzette2016-12-191-0/+2
| | | | | | | Until now this file was just checked into the repo, but actually it should be generated from any.js, struct.js, and timestamp.js. This change updates the build system to make this happen. To make it work I also had to remove some C++11 features from embed.cc.
* Make php generated code conform to PSR-4. (#2435)Paul Yang2016-12-081-2/+1
| | | | 1. Generate single file for each message. 2. Lazily initiate metadata.
* Updated .gitignore with Java and JavaScript build artifactsAdam Cozzette2016-09-291-1/+10
|
* Auto-generate proto files for tests.Bo Yang2016-09-151-0/+2
|
* Check in php implementation. (#2052)Paul Yang2016-09-151-0/+15
| | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields.
* Add note about JSON tests maybe being wrong. (#1992)Thomas Van Lenten2016-08-231-0/+3
| | | | | | | | Add note about JSON tests maybe being wrong. - Add note about the JSON test maybe not being correct yet. - Add test to checks the generated names for double underscores to be sure they are what is expected.
* Fix up ignores and conformance generationThomas Van Lenten2016-08-151-1/+3
| | | | | | - Update ruby conformance generation for rename of generated files that seems to have happened. - Update gitignores for the above and for the no-warnings-test.
* Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-191-7/+5
| | | | | - Add the folder CocoaPods will add to the root folder. - Move and expand the entries in the objectivec directory.
* Add two missing ignores for conformance directory.Thomas Van Lenten2016-05-061-0/+2
|
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-291-0/+1
|
* Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-181-0/+3
|
* Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-161-0/+3
| | | | | | - 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.
* Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-041-0/+1
| | | | | - Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
* Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-151-0/+1
|
* Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-2/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb
| * Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-191-1/+3
| |\
| | * Fix broken builds.Feng Xiao2015-06-171-1/+3
| | |
| * | Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-171-2/+1
| |/
| * Make pbconfig.h independent of config.hJisi Liu2015-06-131-1/+0
| | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
| * ObjC fixup for the branch.Thomas Van Lenten2015-05-261-1/+2
| | | | | | | | | | | | | | | | - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar
| * Fix bugs in objective-c.Bo Yang2015-05-251-0/+3
| |
| * Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-241-0/+9
| |
| * down-integrate internal changesBo Yang2015-05-211-0/+1
| |
| * Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-0/+7
| |\
| | * Merge pull request #331 from thomasvl/objc_alpha1_dropPaul Yang2015-05-061-0/+6
| | |\ | | | | | | | | Objective C compiler plugin and runtime
| | | * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+6
| | | |