aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Makefile.am
Commit message (Collapse)AuthorAge
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| |
| * Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\
| * | Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
|/ / | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
| * Fix Atomic32/AtomicWord on some platforms.Gravatar Jisi Liu2017-11-08
| | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms.
| * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
| |
| * Make distcheck aware of test proto files.Gravatar Jisi Liu2017-08-23
|/
* Make no warning test stricter.Gravatar Jisi Liu2017-08-10
| | | | | - Now it includes -Wextra except for unused-parameter. - Removed gtest dependency
* Make code free of missing-field-initializers warningsGravatar Jisi Liu2017-08-09
|
* Fix invalid offsetof warning.Gravatar Jisi Liu2017-08-03
| | | | Use composition instead of inheritance for oneof default.
* Fix makefile.amGravatar Jisi Liu2017-07-25
|
* Fix build filesGravatar Jisi Liu2017-07-25
|
* Merge from masterGravatar Jisi Liu2017-07-25
|
* Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
|
* Fix distcheckGravatar Jisi Liu2017-07-19
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
|
* Fix C++ distcheck.Gravatar Feng Xiao2017-03-30
|
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* migrate delimited messages functions to util packageGravatar Byron Yi2017-03-16
|
* Hide unnecessary exported library symbolsGravatar Alexandros Frantzis2017-03-13
|
* Detect if Descriptor.cs changes for csharpGravatar Jie Luo2017-03-02
|
* Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Gravatar Jonathan Hseu2017-02-10
| | | the deprecated atomics.
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* Fixed "make distcheck" for the Autotools buildGravatar Adam Cozzette2017-01-09
| | | | | To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES.
* Fixed cross compilations with the Autotools buildGravatar Adam Cozzette2017-01-03
| | | | | | | | Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed.
* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upGravatar Adam Cozzette2016-12-20
|
* Updated Makefile.am to fix out-of-tree buildsGravatar Adam Cozzette2016-12-20
|
* Auto-generate well_known_types_embed.ccGravatar Adam Cozzette2016-12-19
| | | | | | | 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.
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| |
| * Fixing references to the removed atomicops_internals_pnacl.h file.Gravatar Sergio Campama2016-11-10
|/
* Bump library version to 11Gravatar Bo Yang2016-10-10
|
* Bump library veriosn to 3.1Gravatar Bo Yang2016-10-10
|
* Fix bugs for internal integration.Gravatar Bo Yang2016-10-10
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Merge pull request #2112 from pherl/mergeGravatar Jisi Liu2016-09-15
|\ | | | | Merge 3.0.x into master
* | Check in php implementation. (#2052)Gravatar Paul Yang2016-09-15
| | | | | | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields.
| * Merge pull request #1905 from pherl/fixdocGravatar Jisi Liu2016-08-02
|/| | | | | Add and fix C++ runtime docs
| * Add and fix C++ runtime docsGravatar Jisi Liu2016-08-02
| |
* | Change the build.zip.sh to support liteGravatar Jisi Liu2016-07-28
|/
* Fixed Makefile.am for Ruby file rename.Gravatar Josh Haberman2016-07-26
|
* Add a test to catch sign-comparison warnings.Gravatar Feng Xiao2016-07-22
| | | | | | | | grpc build treates them as errors and such issues (protobuf change breaks grpc) has been reported repeatedly. For example: https://github.com/google/protobuf/issues/1813 Change-Id: I077c4557cf3effd5195f88802c38999b884edc30
* Add files missing from "make dist".Gravatar Feng Xiao2016-07-19
| | | | Change-Id: I56a6cce613462794f172ff2e62b25d8a9fc162f3
* Add missing golden test file.Gravatar Feng Xiao2016-07-14
|
* Fix some failing travis tests.Gravatar Feng Xiao2016-07-01
| | | | | | | 1. Add missing header file to Makefile.am. 2. Re-generate objectivec generated code for well-known types. Change-Id: If28217c701cf8bd739ea0db240e9eee600f23ee7
* Change protobuf CPP proto generator to support the 'lite' option inGravatar Chad Whipkey2016-04-15
| | | | | | | | | proto3. Added a couple unit test proto3 files, for arena_lite and lite. Cloned the proto3_arena_unittest to test some of the basics of generated code (and to ensure that the generated proto3 test files are used by some test).