AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
9,196 Commits 35 Branches 138 Tags 124 MiB
5b28ae70c0
Commit Graph

51 Commits

Author SHA1 Message Date
David L. Jones
b012ef28b9 Regenerate cmake file lists. 2022-03-23 18:10:27 -07:00
David L. Jones
40db3dabf0 Sync from Piper @436871048 
PROTOBUF_SYNC_PIPER
 2022-03-23 17:36:26 -07:00
Adam Cozzette
b20209f321 Sync from Piper @acozzette/proto_github_202203101748 
PROTOBUF_SYNC_PIPER
 2022-03-10 18:36:42 +00:00
Arfrever Frehtes Taifersar Arahesis
426866285b cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596) 
protobuf_source_dir variable is no longer needed and has the same value
as protobuf_SOURCE_DIR variable, which is instance of CMake-standard
<PROJECT-NAME>_SOURCE_DIR variable:
https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
 2022-03-09 14:55:55 -08:00
Arfrever
1cec803182
CMake fixes (#9595) 
* Support older versions of CMake.

VERSION_GREATER_EQUAL is supported by CMake >=3.7:
https://cmake.org/cmake/help/latest/command/if.html#version-greater-equal

target_link_options() is supported by CMake >=3.13:
https://cmake.org/cmake/help/latest/command/target_link_options.html

* Use PROTOBUF_USE_DLLS and LIBPROTOC_EXPORTS for libprotoc.so shared library

Similar change for libprotobuf.so and libprotobuf-lite.so was made
in commit 5a0887fc65.

* Make value of PROTOC_EXPORT dependent on LIBPROTOC_EXPORTS instead of LIBPROTOBUF_EXPORTS

This was probably intention, and LIBPROTOC_EXPORTS is also used above
in _MSC_VER branch.
 2022-03-07 17:03:50 -08:00
Adam Cozzette
88a18db91e Update protobuf version 2022-03-04 09:52:19 -08:00
Arfrever
1d13b60904
cmake: Use linker version scripts (#9545) 
Autotools build system already uses linker version scripts since
commit 13d165de9e.

Fixes: #6113
 2022-03-01 17:06:14 -08:00
Arfrever
d0c06bcd93
cmake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (#9529) 
Soname was set for libprotobuf.so in commit a9cf69a0ed,
but similar changes for libprotobuf-lite.so and libprotoc.so were missed.

Fixes: #8635

Co-authored-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@GMail.Com>
 2022-02-22 15:53:14 -08:00
Deanna Garcia
ab4585a695 Sync from Piper @425656941 
PROTOBUF_SYNC_PIPER
 2022-02-01 18:24:53 +00:00
Adam Cozzette
9488e2f8eb
Update cmake file lists (#9038) 
I ran ./update_file_lists.sh to update these files.
 2021-10-12 10:08:05 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834 
PROTOBUF_SYNC_PIPER
 2021-09-09 08:21:42 -07:00
Jorge López Fueyo
1ae531d73b
Disabled version.rc for clang-cl (#8139) 2021-06-04 11:13:56 -07:00
deannagarcia
76188afb94
Merge pull request #8272 from deannagarcia/kotlinProtos 
Opensourcing kotlin protos
 2021-04-21 10:29:26 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Deanna Garcia
438d777e05 Adding file names to cmake files 2021-03-24 20:00:57 +00:00
deannagarcia
9fee757e46
Update libprotoc.cmake 2021-01-25 16:21:42 -08:00
Adam Cozzette
81f6aa404c Ran ./update_file_lists.sh to update CMake configuration 2018-12-10 13:49:44 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Feng Xiao
b1c5503022
Delete unused files. (#4942) 
* Delete unused files.
 2018-07-19 17:30:15 -07:00
Feng Xiao
143851ed25
Remove js_embed binary. (#4709) 
* Remove js_embed binary.
 2018-06-01 11:00:04 -07:00
Ivan Shynkarenka
291d9a0ab0 Fix issue with version.rc 2018-05-15 23:19:58 +03:00
Jozef Izso
b1fecd0dea Include file information in all DLL and EXE outputs 2018-04-28 00:12:38 +02:00
Feng Xiao
d5a0024171 Remove javanano. 2018-03-26 12:59:28 -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
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
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Jisi Liu
8084e03c33 remove profile 2017-07-19 12:46:33 -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
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
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Konstantin Podsvirov
97cbc42621 Fix libprotoc.cmake to generate well_known_types_embed.cc 
Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior.

Now everything will be fine.
 2017-03-15 14:16:49 -07:00
Adam Cozzette
1b3a0c16e6 Auto-generate well_known_types_embed.cc 
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.
 2016-12-19 14:38:21 -08:00
Adam Cozzette
1673389ef1 Updated libprotoc.cmake 2016-11-17 17:05:38 -08:00
Paul Yang
e0e54661f7 Check in php implementation. (#2052) 
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
 2016-09-15 11:09:01 -07:00
Jisi Liu
5221dcbe47 Integrate from google internal. 
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
 2016-01-29 13:51:05 -08:00
Feng Xiao
e841bac4fc Down-integrate from internal code base. 2015-12-11 17:10:28 -08:00
Jon Skeet
a6361a124a Rename "umbrella" to "reflection" consistently. 
This changes csharp_names.h, which will require a corresponding change in GRPC.
 2015-11-19 13:05:17 +00:00
Feng Xiao
5314ad1b21 Merge pull request #783 from podsvirov/topic-cmake-project 
Improved CMake project
 2015-10-16 14:08:38 -07:00
Konstantin Podsvirov
c3aa4c2675 Improved SHARED build from CMake project 2015-10-15 02:56:48 +03:00
Jon Skeet
67dd42c50d First pass at generating XML documentation from .proto comments. 
This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing.

Generated code changes coming in next commit.
 2015-10-01 10:36:58 +01:00
Konstantin Podsvirov
f397ede7c6 Add CMake option protobuf_DEBUG_POSTFIX 2015-09-17 13:00:12 +03:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf 
Change-Id: If3fb07754a734bae610d95124528e073515ac525
 2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07:00
Jon Skeet
b2ac868493 First part of implementing wrapper types. Not ready yet! 2015-07-16 09:36:30 +01:00
Jon Skeet
0d684d3420 First pass at map support. 
More tests required. Generated code in next commit.
 2015-06-25 09:39:28 +01:00
Jon Skeet
09f3f4eec3 Updates to handle use of cmake for Windows builds. 2015-06-17 15:16:14 +01:00