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

258 Commits

Author SHA1 Message Date
afshinpir
c62ffaa539 Incorrect selection of base name 
protoc just changes last extension. We need this change to support files like a.b.proto in the path.
 2020-04-07 10:27:11 -07:00
Joshua Haberman
b99994d994 Sync from Piper @304070343 
PROTOBUF_SYNC_PIPER
 2020-03-31 16:25:37 -07:00
Falko Axmann
460376190b cmake: extended protobuf_generate 
Added an optional `PLUGIN` argument to `protobuf_generate` which
will be forwarded to the `--plugin=` argument of `protoc`.
 2020-03-09 15:03:07 -07:00
Chuck Atkins
10c48c980f Intel compiler: silence noisy warning for incorrectly evaluated inlining 2020-02-12 13:08:59 -08:00
Rafi Kamal
de75651d7a
Merge 3.11.0-rc1 changes to master (#6917) 
* Update CHANGES.txt with 3.11.0-RC1 release notes (#6909)

* Revert "Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required." (#6914)

* Marked update_compatibility_version.py as executable (#6916)
 2019-11-20 18:03:29 -08:00
Rafi Kamal
58d4420e2d Down Integrate Internal Changes 2019-11-12 13:38:58 -08:00
veawor
129a7c875f Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required. 2019-10-30 16:31:05 -07:00
Daniel Johansen
e93dea7746 update Cmake example to build Visual Studio to newest 2019 version. 2019-10-18 15:39:20 -07:00
debugx
9fdb2cf2bb fixed typo 2019-10-15 12:05:14 -07:00
Changming Sun
95a1c4fbc4 Fix #6098 2019-09-27 15:44:33 -07:00
Yannic Bonenberger
27e85ab55d Address review comments 2019-07-24 10:23:55 -07:00
Yannic Bonenberger
4979489451 Add test to verify BUILD- and cmake-files are in sync with src/Makefile.am 2019-07-24 10:23:55 -07:00
Adam Cozzette
582640ef31 Updated cmake path to io_win32.h (#6397) 
Fixes #6382.
 2019-07-17 15:38:57 -07:00
Ben Bader
56e7bdf278 Fix builtin_atomics check in CMakeLists.txt 2019-07-08 20:30:04 -07:00
boscosiu
55ed1d427c link libatomic on systems without adequate builtin atomics 2019-07-03 15:32:29 -07:00
Hao Nguyen
51026d9229 Down integrate to GitHub 2019-06-26 11:01:34 -07:00
Carlos O'Ryan
b10d490efd Fix RPATH when CMAKE_INSTALL_LIBDIR != lib. 
In some platforms ${CMAKE_INSTALL_LIBDIR} expands to `lib64`. The libraries
are correctly installed in that directory, but the RPATH is set to point to
`$ORIGIN/../lib`, where it should be `$ORIGIN/../lib64`.
 2019-06-05 10:39:02 -07:00
Hao Nguyen
1d4e959374 Down integrate to GitHub 2019-05-03 14:33:43 -07:00
Hao Nguyen
6dc9832aab Merge branch 'master' of https://github.com/protocolbuffers/protobuf into sync201904090622 2019-04-09 06:25:48 -07:00
Hao Nguyen
176f7db11d Down integrate to Github 2019-04-09 06:23:32 -07:00
Hao Nguyen
c163a2d1a4 Revert accidentally commit 2019-04-05 17:09:42 -07:00
Hao Nguyen
86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf 2019-04-05 16:41:24 -07:00
Hao Nguyen
a48a574f7e Down integrate to Github 2019-04-05 16:39:18 -07:00
Phillipp Schoppmann
8e5b2f1b82 Update file list for protobuf_lite 2019-04-01 14:06:18 -07:00
Adam Cozzette
8645d893ab Merge branch '3.7.x' into merge-3-7-x 2019-03-26 14:32:20 -07:00
Adam Cozzette
e6779e9b2a Added io_win32.h to header list in CMake config 
This should fix #5717 and ensure that this header gets installed
properly on Windows.
 2019-03-21 10:30:37 -07:00
Hao Nguyen
d47c3e9258 Fix CMake conflict 2019-03-20 11:51:42 -07:00
Hao Nguyen
2f864fdfdf Down integrate to Github 2019-03-20 11:45:01 -07:00
Bo Yang
cb6fa92ee8 Merge branch '3.7.x' 2019-03-04 10:18:18 -08:00
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