aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Fix failing tests.Feng Xiao2018-08-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix C++ tests. * Add missing files to Makefile.am and fix distcheck in tests.sh * Remove BUILT_SOURCES from conformance/Makefile.am. * Add some missing override keyword. * Add a type cast to int64 because our StrCat() in stubs can't handle size_t. 2. Fix Java tests. * Add missing test dependency on guava in pom.xml. * Include newly referenced test data in test resources. * Manually fix map_lite_test.proto which is overwritten because it's mapped from map_test.proto in google3. * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the opensource test passing as it's still running lite tests. * Add a type cast in newBuilder() because without it the code doesn't compile with openjdk javac 1.8 (the compiler can't figure if it's the right type due to complex generic typing). 3. Fix Python tests. * Remove/replace references to <hash_map>. * Suppress more warnings in setup.py. * Replace incorrect header inclusion for google/protobuf/proto_api.h. * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's referenced in the updated python C extension code. * Replace proto2 with google::protobuf. The proto2 name is leaked to opensource because we removed the subsitition rule for proto2 namespace but only fixed C++ source code and forgot to update python C extension code.
* Merge master branch.Feng Xiao2018-08-081-3/+3
|\
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-3/+3
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-3/+3
| | |
| | * Remove js_embed binary. (#4709)Feng Xiao2018-07-161-20/+1
| | | | | | | | | | | | * Remove js_embed binary.
* | | Down-integrate from google3.Feng Xiao2018-08-081-1/+8
|/ /
* | Delete unused files. (#4942)Feng Xiao2018-07-191-4/+0
| | | | | | * Delete unused files.
* | Add -Og to no-warning-test (#4830)Paul Yang2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | * Add -Og to no-warning-test * Initialize value * Implement PrintFieldName in CompactRepeatedFieldPrinter to prevent Woverloaded-virtual * Update generated code
* | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-3/+3
|\|
| * Update version number to 3.6.0Jisi Liu2018-05-141-3/+3
| |
* | Remove js_embed binary. (#4709)Feng Xiao2018-06-011-20/+1
|/ | | | * Remove js_embed binary.
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-261-23/+27
| | | Add googletest as a submodule in third_party/googletest.
* Remove javanano.Feng Xiao2018-03-261-24/+0
|
* Removed some unused C++ source filesAdam Cozzette2018-03-221-2/+0
|
* Added new test source files to Makefile.amAdam Cozzette2018-03-201-0/+4
|
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-25/+2
|
* Remove the use of BUILT_SOURCESFeng Xiao2018-01-241-4/+4
| | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3912 [BUILT_SOURCES](https://www.gnu.org/software/automake/manual/html_node/Sources.html) is used with [Automake's automatic dependency tracking](https://www.gnu.org/software/automake/manual/html_node/Dependencies.html#Dependencies) but doesn't work well in protobuf when cross-compiling. Their presence causes maek to always generate them even when they are not requested and as a result causes cross-compilation to fail because the built protoc cannot be used to generate unittest protos (see: https://github.com/google/protobuf/issues/3912). Removing it with explicit dependencies fixes the build issue when running 'make', 'make all', 'make install' at cross-compilation. It doesn't affect 'make protoc' because BUILT_SOURCES only works for the implicit targets 'all', 'check' or 'install'.
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-3/+4
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-3/+3
| |
| * Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | This fixes the following build error: oldpwd=`pwd` && cd .../protobuf/src && \ $oldpwd/js_embed google/protobuf/compiler/js/well_known_types/any.js google/protobuf/compiler/js/well_known_types/struct.js google/protobuf/compiler/js/well_known_types/timestamp.js > $oldpwd/google/protobuf/compiler/js/well_known_types_embed.cc /bin/bash: line 1: .../protobuf/target/src/google/protobuf/compiler/js/well_known_types_embed.cc: No such file or directory Makefile:8201: recipe for target 'google/protobuf/compiler/js/well_known_types_embed.cc' failed which is observed during the cross-compilation since the version 3.2.
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-7/+3
|\ \
| * | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-4/+3
| |\|
| | * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.0Jisi Liu2017-11-021-3/+3
| | |
| * | Move C#-only test protos to csharp/protosJon Skeet2017-11-121-3/+0
| |/ | | | | | | | | | | | | | | | | | | 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#.
* / Integrated internal changes from GoogleAdam Cozzette2017-12-011-0/+2
|/
* Merge from google internalJisi Liu2017-10-181-0/+2
|
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-2/+8
|\
| * Make distcheck aware of test proto files.Jisi Liu2017-08-231-2/+8
| |
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+3
|/
* Make no warning test stricter.Jisi Liu2017-08-101-12/+7
| | | | | - Now it includes -Wextra except for unused-parameter. - Removed gtest dependency
* Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-091-1/+2
|
* Fix invalid offsetof warning.Jisi Liu2017-08-031-1/+1
| | | | Use composition instead of inheritance for oneof default.
* Fix makefile.amJisi Liu2017-07-251-0/+3
|
* Fix build filesJisi Liu2017-07-251-0/+3
|
* Merge from masterJisi Liu2017-07-251-1/+2
|
* Update version number for 3.4.0Jisi Liu2017-07-241-3/+3
|
* Fix distcheckJisi Liu2017-07-191-0/+1
|
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-7/+5
|
* Update version number and changelog for 3.3.0Feng Xiao2017-04-051-3/+3
|
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
|
* Down-integrate from google3.Feng Xiao2017-03-291-13/+30
|
* migrate delimited messages functions to util packageByron Yi2017-03-161-0/+3
|
* Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-131-0/+15
|
* Detect if Descriptor.cs changes for csharpJie Luo2017-03-021-0/+1
|
* Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Jonathan Hseu2017-02-101-1/+0
| | | the deprecated atomics.
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 buildAdam Cozzette2017-01-091-2/+4
| | | | | 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 buildAdam Cozzette2017-01-031-3/+6
| | | | | | | | 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 upAdam Cozzette2016-12-201-1/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 05:11:26 +0000