AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
7,841 Commits 35 Branches 138 Tags 124 MiB
48234f5f01
Commit Graph

279 Commits

Author SHA1 Message Date
Yilun Chong
429d2ae19f
Merge branch 'master' into integration 2019-02-24 17:17:17 -08:00
Yilun Chong
d8c2501b43 down integration from internal 2019-02-22 18:13:33 +08:00
Xiang Dai
e479410564 delete all duplicate empty blanks (#5758) 
Signed-off-by: Xiang Dai <764524258@qq.com>
 2019-02-20 19:28:50 -08:00
Paul Yang
5b4ac53c97
Add several fixes for python toolchain (#5667) 
* Add several fixes for python toolchain

* Fix versin regex

* Make script exit on error

* Fix version regex

* Fix version regex

* Fix version regex

* Fix version regex

* Make test run on the current commit

* Fix test

* Fix test

* Use git to retrieve current commit

* Fix tests

* Fix tests

* Also make linux and mac work on the current commit

* Fix test
 2019-02-01 18:43:55 -08:00
Michael Matthew Mitchell
dface63d71 Swapped libprotoc and libprotobuf 
libprotobuf being targed before libprotoc was causing Visual Studio to fail in linking protoc.
 2019-01-31 14:35:57 -08:00
Bo Yang
dbfb9a8a07 Merge branch 'master' into 3.7.x 2019-01-23 12:49:53 -08:00
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555) 
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
 2019-01-08 15:06:30 -08:00
Adam Cozzette
43c3abf077
Merge pull request #5489 from aaron-bray/master 
Use NoLocalStrtod for international compliance
 2018-12-21 21:07:34 -08:00
Aaron Bray
424308216a Add strtod to libprotobuf-lite 2018-12-20 14:13:57 -05:00
Paul Yang
cecba296b8
Down-integrate internal changes (#5467) 
* Down-integrate internal changes

* Update generated code for php, objc and csharp.

* Add missing dependency in conformance_php
 2018-12-14 16:05:03 -08:00
Adam Cozzette
81f6aa404c Ran ./update_file_lists.sh to update CMake configuration 2018-12-10 13:49:44 -08:00
Joshua Haberman
d7cd54372c
Merge pull request #5396 from hesmar/hesmar/fixCmakeInstallHeader 
Windows: install missing headers
 2018-12-10 22:41:44 +01:00
Abdel Younes
35aa9fdcbd fix: cmake install 2018-12-10 14:55:17 +01:00
Markus Heß
6688b60c36 Windows: install missing headers 2018-12-05 17:27:21 +01:00
dyyap
436139803f Updated README.md (#5366) 
* Update README.md
 2018-11-15 18:47:08 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Markus Heß
1509e8e3b3 Revert "protobuf_generate(): add relative path to output dir" 
This reverts commit 93f6b67eb2.

Protoc adds already the relative path to the output directory.
Therefore, we have to remove this again from the output directory
to prevent adding it twice.
 2018-09-28 11:00:55 +02:00
Joshua Haberman
64f5af2f9c Added conformance test impl file to CMake. 2018-09-02 14:22:52 -07:00
Joshua Haberman
d340bdf508
Merge pull request #5078 from haberman/conformance-cmake 
Added cmake build files for the conformance test runner.
 2018-09-02 10:07:14 -07:00
Josh Haberman
4249692ce6 Added cmake build files for the conformance test runner. 
I want to use the conformance tests from upb, which is switching
to CMake.
 2018-08-24 12:27:21 -07:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Feng Xiao
bde4eaf137 Update build files. 
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
 2018-08-13 14:41:27 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Roman Popov
a69dfe63bc tests: fix link failure and stack overflow on Mingw w64 2018-07-30 21:55:44 -07:00
Feng Xiao
b1c5503022
Delete unused files. (#4942) 
* Delete unused files.
 2018-07-19 17:30:15 -07:00
Markus Heß
93f6b67eb2 protobuf_generate(): add relative path to output dir 
Without this fix, protobuf_generate() sets the variable _generated_srcs to
${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext}
but generates the files in
${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}
 2018-07-10 18:23:53 +02:00
Steffen Wittmeier
3e84147d53 Fixed protobuf_generate output definition for files relative to the protobuf_generate command 2018-06-25 11:29:56 +02:00
Feng Xiao
143851ed25
Remove js_embed binary. (#4709) 
* Remove js_embed binary.
 2018-06-01 11:00:04 -07:00
Mizux
7306f549bf CMake OSX rpath management (#4620) 
* CMake: Add comment for CMP0048

* CMake: osx use @rpath/ as target's install name (CMP0042)

On MacoS library should use @rpath/ as prefix path instead of absolute build path
e.g. otool -L libprotobuf.dylib
libprotobuf.dylib:
  @rpath/libprotobuf.dylib (...)
  ...

* CMake: add rpath to target for LINUX and APPLE
 2018-05-22 12:52:07 -07:00
Feng Xiao
fb33d88ed1
Merge pull request #4619 from ccvca/cmake_protobuf_generate_changes 
cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
 2018-05-17 10:17:57 -07:00
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Christian von Arnim
411018e3fb
cmake: Fix DEPENDS of add_custom_command in protobuf_generate 2018-05-15 09:06:54 +02:00
Feng Xiao
ac34bf8f59
Merge pull request #4579 from jozefizso/dev/3380_version_info 
Include version information in Windows binaries #3380
 2018-05-14 13:47:28 -07:00
Feng Xiao
4600f789a2
Merge pull request #4587 from chronoxor/master 
Appveyor MinGW build
 2018-05-14 13:44:29 -07:00
Christian von Arnim
b9c0c5f526
cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate 2018-05-14 09:22:34 +02:00
Christian von Arnim
e8ae76fbde
cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate 2018-05-14 09:22:08 +02:00
Feng Xiao
2213c1c1f6
Merge pull request #4538 from Mizux/patch-2 
Add .proto files to extract_includes.bat
 2018-05-10 22:44:47 -07:00
Ivan Shynkarenka
feb183d895 Appveyor MinGW build 2018-05-03 03:17:19 +03:00
Ivan Shynkarenka
f80a886bc1 Cygwin build failed 2018-05-02 03:01:10 +03:00
Jozef Izso
b1fecd0dea Include file information in all DLL and EXE outputs 2018-04-28 00:12:38 +02:00
Jozef Izso
3415201d1d Add file information to Windows binaries 2018-04-27 23:44:38 +02:00
Corentin Le Molgat
2bd7f516e5 fix duplicate mkdir in update_file_lists.sh 
- merge loop for .h and .proto includes
- fix shellcheck errors
 2018-04-25 08:22:30 +02:00
Corentin Le Molgat
c3b152c7e0 CMake: Update CXX Standard management 2018-04-24 17:21:16 +02:00
Mizux
3ad8efc75b Add .proto files to extract_includes.bat 
For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value...
-> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case.
 2018-04-24 13:55:54 +02:00
Silver Chan
d3e8a54020
Fix problem: cmake build failed in c++11 by clang 
CMakeLists.txt adds c++11 flags for clang
 2018-04-04 10:31:05 +08:00
Feng Xiao
40d6eca832
Merge pull request #4467 from xfxyjwf/error 
Improve error message when googletest is missing.
 2018-04-02 14:46:58 -07:00
Feng Xiao
8f88a507ee Improve error message when googletest is missing. 2018-04-02 14:28:25 -07:00
Feng Xiao
014e76e2cd Update instructions about getting protobuf source. 2018-03-29 13:14:00 -07:00
Carlos O'Ryan
3c5442a95d Include googletest as a submodule (#3993) 
Add googletest as a submodule in third_party/googletest.
 2018-03-26 13:54:32 -07:00
Feng Xiao
d5a0024171 Remove javanano. 2018-03-26 12:59:28 -07:00
Adam Cozzette
0c5fcdee44 Removed some unused C++ source files 2018-03-22 10:15:31 -07:00
Adam Cozzette
afe96b6d42 Merge branch 'master' into down-integrate 2018-03-13 16:54:31 -07:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
Feng Xiao
fd595fcc93 Revert "Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources." 
This reverts commit 724f0be33d.
 2018-03-01 16:36:05 -08:00
John Millikin
724f0be33d Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources. 
This lets all values of `WELL_KNOWN_PROTOS` be treated the same with
regard to Bazel's protobuf blacklisting.
 2018-02-24 11:34:40 -08:00
Abdul Sami
fe33c5fe9d
Added instruction for existing ZLIB configuration 
Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
 2018-02-21 12:17:55 +05:00
Feng Xiao
82e0231607
Merge pull request #4259 from Mizux/master 
Various CMake Update
 2018-02-02 11:47:31 -08:00
Corentin Le Molgat
1ec9beb477 Use NEW behaviour for project VERSION variables. 
cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
 2018-02-01 20:31:50 +01:00
Corentin Le Molgat
8dd0f4e557 Even with MSVC enable zlib support as default behaviour. 2018-02-01 20:31:36 +01:00
Corentin Le Molgat
f7a05844eb Add CMake ALIAS targets 
We follow the findProtobuf.cmake naming convention
to ease the use of protobuf as cmake subproject
 2018-02-01 20:31:36 +01:00
Corentin Le Molgat
3bc0282fb6 Add VERSION property to CMake library targets 2018-02-01 20:31:36 +01:00
Ben Boeckel
9d0a44c9de cmake: privately add sources to targets 
Public sources get added to dependencies of the target as well which can
cause duplicate symbols.
 2018-01-19 12:05:00 -05:00
Adam Cozzette
609d752650 Ran update_file_lists.sh to update Bazel and CMake file lists 
This should fix Bazel builds, since those were missing a new file
(implicit_weak_message.cc).
 2017-12-07 14:16:50 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Yangqing Jia
cba18efe18 Allow one to omit building libprotoc and protoc binaries 2017-11-13 15:15:39 -08:00
Jisi Liu
181e284b55 Fix Atomic32/AtomicWord on some platforms. 
- 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.
 2017-11-08 15:27:48 -08:00
Jisi Liu
4526d8baa0
Merge pull request #3722 from timou/cmake-windows-clean 
Suppress VS2017 compiler/linker warnings
 2017-10-27 12:37:30 -07:00
Tim Ebringer
a23669c2f6 Sort MSVC warning suppressions 
Add brief documentation describing each warning suppression.
 2017-10-21 09:40:32 -04:00
Jisi Liu
07b9238a1c Merge pull request #3770 from pherl/3.5-integrate 
Integrate google internal changes for the up coming 3.5 release.
 2017-10-19 10:48:54 -07:00
Jisi Liu
9c407a16e4 Merge pull request #3751 from uykusuz/master 
fixes issue #3750
 2017-10-18 15:39:12 -07:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Boris Broenner
be13314b2a fixes issue #3750 
In protobuf-module.cmake: in addition to checking for release or debug
variants of protoc's location we should also check the configuration "noconfig".
 2017-10-14 00:41:40 +02:00
Tim Ebringer
2a72840425 Suppress VS2017 compiler/linker warnings 
VS2017 warns about a few additional things, for example, files that
define no symbols (which is typically the result of a platform specific
ifdef not applying on Windows).

Suppress these warnings so the build is clean on VS2017.
 2017-10-06 15:56:30 -04:00
Markus Heß
f7e209951e protobuf_generate: create include path only for proto files 2017-09-29 11:07:36 +02:00
Markus Heß
0e069e5a2d generate python code when calling PROTOBUF_GENERATE_PYTHON 2017-09-25 11:08:12 +02:00
Markus Heß
9829b8f511 protobuf_generate: add EXPORT_MACRO option 2017-09-22 11:44:59 +02:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
471b45e895 Merge pull request #3158 from yeswalrus/fix-policy-warning 
Fix policy warning CMP0054
 2017-09-13 15:15:04 -07:00
Markus Heß
444aecd35a fix protobuf_generate function 2017-09-12 10:00:04 +02:00
Jisi Liu
d77c8c5e44 remove the duplication 2017-08-01 14:01:55 -07:00
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
e177739fa2 Fix build files 2017-07-25 14:37:19 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Jisi Liu
1876a27e66 Update filelist again 2017-07-19 14:46:49 -07:00
Jisi Liu
8084e03c33 remove profile 2017-07-19 12:46:33 -07:00
Jisi Liu
11b6661e66 update build file list 2017-07-19 12:10:43 -07:00
Jisi Liu
3af881c7e2 Merge master into 3.4.x 2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
yjjnls
8f367c0b2d replenish missed header files in install step 
install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
 2017-06-19 14:15:54 +08:00
Walter Gray
0336770801 add protobuf_generate function, allows use of target_sources where available 2017-06-02 19:57:08 -07:00
Walter Gray
d8c5865e25 Fix policy warning CMP0054 2017-05-30 15:08:45 -07:00
Walter Gray
faa53989cb fix check_and_save_build_option not correctly exporting build options 2017-05-30 15:04:11 -07:00
Walter Gray
a183a0df61 Fix the check_and_save_build_option macro never evaluating to true 2017-05-30 15:04:11 -07:00
Walter Gray
ae85cb8ef3 Fix find module not working when no version number was given 2017-05-30 15:04:11 -07:00
Dennis Cappendijk
4eb02fe31e Add headers as part of cmake project 
tested only on windows with visual studio 2015 as generator
 2017-05-29 17:34:08 +02:00
Feng Xiao
32d7830e4b Fix C++ build for down-integration. 2017-03-29 14:52:33 -07:00
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00