681 Commits

Author SHA1 Message Date
Robert Edmonds
2c63d76205 protoc-c: Fix -Wsign-compare diagnostics
This commit fixes the following compiler diagnostics:

    ../protoc-c/c_helpers.cc: In function ‘void google::protobuf::compiler::c::PrintComment(google::protobuf::io::Printer*, std::__cxx11::string)’:
    ../protoc-c/c_helpers.cc:221:25: warning: comparison of integer expressions of different signedness: ‘int’ and ‘std::vector<std::__cxx11::basic_string<char> >::size_type’ {aka ‘long unsigned int’} [-Wsign-compare]
           for (int i = 0; i < comment_lines.size(); i++)
                           ~~^~~~~~~~~~~~~~~~~~~~~~
    ../protoc-c/c_helpers.cc: In function ‘std::set<std::__cxx11::basic_string<char> > google::protobuf::compiler::c::MakeKeywordsMap()’:
    ../protoc-c/c_helpers.cc:273:21: warning: comparison of integer expressions of different signedness: ‘int’ and ‘long unsigned int’ [-Wsign-compare]
       for (int i = 0; i < GOOGLE_ARRAYSIZE(kKeywordList); i++) {
                         ^
2023-07-08 20:50:57 -04:00
Robert Edmonds
69fc2f13bb
Merge pull request #673 from protobuf-c/edmonds/new-google-support
Support for new Google protobuf 22.x, 23.x releases
2023-07-08 20:17:30 -04:00
Robert Edmonds
5b0661f1e8 configure.ac: Require C++17
There are some recent reports of strange build failures that might have
been fixed by compiling in C++17 mode, so it might be a good idea to use
C++17 in general, and not just when building against very recent
protobuf versions.

Since it looks like we've lost protobuf < 3.0.0 support, configure.ac
can be simplified a bit if we just use C++17 by default.
2023-07-03 01:10:28 -04:00
Robert Edmonds
7582b6e7d6 cmake: Require C++17
Newer versions of protobuf apparently don't build with older versions of
the C++ standard.
2023-07-02 22:58:48 -04:00
Robert Edmonds
1937ba946b protoc-c: Use FileDescriptorLegacy to obtain proto syntax version on protobuf >= 23.0
Use the newer "legacy" way of determining whether a file descriptor is
using proto2 or proto3 syntax on protobuf >= 23.0.

Based on
66574f3fd8
but continues to support older versions of protobuf.

Unfortunately, since this is a "deprecated", "legacy" API it'll probably
disappear in about five seconds.
2023-07-02 22:57:57 -04:00
Robert Edmonds
23d2246e0f configure.ac: Require C++17 when building against protobuf >= 4.22.0
It's unclear from looking at the online protobuf documentation whether
C++14 or C++17 is now required when building against newer versions of
protobuf (or perhaps I'm looking in the wrong place), but experimentally
it did not work for me with C++14.

This commit rewrites the versioned PKG_CHECK_MODULES checks in
configure.ac to enforce the following policies:

 * Require protobuf >= 2.6.0.
 * On protobuf >= 3.0.0, require C++11.
 * On protobuf >= 4.22.0, require C++17.
2023-07-02 22:45:44 -04:00
Robert Edmonds
8d334a7204 Work around GOOGLE_* changes in protobuf >= 22.0
According to the protobuf migration guide as of June 2023 [0], protobuf
22.0 (aka 4.22.0) took a dependency on something called "abseil" and as
a result the "stubs" have been removed. This apparently caused all the
uses of GOOGLE_* identifiers in protoc-c to fail when building against
newer versions of protobuf.

This commit introduces compatibility definitions when building against
protobuf >= 4.22.0 so that protobuf-c can build against older and newer
versions of protobuf.

[0] https://web.archive.org/web/20230611151200/https://protobuf.dev/support/migration/#abseil
2023-07-02 19:42:19 -04:00
Robert Edmonds
7b90330bff Use GOOGLE_LOG(FATAL) instead of GOOGLE_LOG(DFATAL)
Looking at where these identifiers are ultimately defined [0], it looks
like "DFATAL" means either "ERROR" or "FATAL" depending on whether
NDEBUG is defined. However, looking at the actual code sites in protoc-c
where DFATAL is used, it's not clear why we couldn't just use FATAL
unconditionally.

This is aimed at supporting newer versions of protobuf where the DFATAL
identifier apparently no longer exists.

[0] https://github.com/protocolbuffers/protobuf/blob/v21.12/src/google/protobuf/stubs/logging.h#L61-L65
2023-07-02 19:35:43 -04:00
Robert Edmonds
ad48868dfe protoc-c: Remove GOOGLE_DISALLOW_EVIL_CONSTRUCTORS macro invocations
protobuf has removed the definition of this macro as of commit
1595417dd3859bbff7d3d61ad0b6e39044d47489, so the invocation of this
macro in protobuf-c breaks the build when building agaist the protobuf
22.x or 23.x series.

Simply removing the macro invocations seems to be safe and doesn't break
the build on Debian's protobuf 3.21.12 nor Debian's protobuf 3.6.1.3.
2023-07-02 17:48:18 -04:00
Robert Edmonds
c3f525da36
Merge pull request #550 from AtariDreams/fixup
Update autotools
2023-07-02 02:55:13 -04:00
Robert Edmonds
cdab7b8a1a
Merge pull request #545 from rgriege/fix-clang-warning
Avoid "unused variable" compiler warning
2023-07-02 02:46:50 -04:00
aviborg
8fd6cf4b88
remove deprecated functionality (#542)
Co-authored-by: Andreas Viborg <andreas.viborg@maxar.com>
Co-authored-by: Robert Edmonds <edmonds@users.noreply.github.com>
2023-07-02 02:39:10 -04:00
Robert Edmonds
5f2aa966de
Merge pull request #482 from KivApple/master
Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR
2023-07-02 02:19:16 -04:00
Robert Edmonds
484e6b98b2
Merge pull request #472 from morrisonlevi/cmake-targets
Export and install CMake targets
2023-07-02 02:11:05 -04:00
Robert Edmonds
0c5f04555a
Merge pull request #525 from defold/fix-unzip-on-windows
GitHub actions fail on Windows due to missing unzip command
2023-07-02 01:37:51 -04:00
Rose
59a3f1925e Update autotools
AC_PROG_CC_STDC is obsolete. Instead, AC_PROG_CC is recommended.
2023-05-06 19:18:26 -04:00
Ryan Griege
aebf3a0b60 Avoid "unused variable" compiler warning 2023-03-12 21:03:31 -05:00
Robert Edmonds
5c5a9981c0
Merge pull request #486 from franksinankaya/frkaya/linkorder
Makefile.am: change link order
2023-01-04 23:45:17 -05:00
Björn Ritzl
182953ead0 Use 7zip instead
7zip is installed on the GitHub runners: https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md#tools
2022-10-01 22:00:23 +02:00
Robert Edmonds
abc67a11c6 ChangeLog: 1.4.1 v1.4.1 2022-07-10 21:33:59 -04:00
Robert Edmonds
471aaa5f6d Bump copyright years to 2022 2022-07-10 21:33:59 -04:00
Robert Edmonds
a0a0131c89 Bump version to 1.4.1 2022-07-10 21:33:59 -04:00
Robert Edmonds
6d4eafd55f
Merge pull request #514 from protobuf-c/edmonds/issue512
Fix issue #512: clang analyzer 14 warning about a possible NULL deref.
2022-07-10 21:12:43 -04:00
Todd C. Miller
ab5f76a52b Fix a clang analyzer 14 warning about a possible NULL deref.
[edmonds: Import commit from
bfc6249902.patch.]
2022-07-10 20:39:06 -04:00
Robert Edmonds
ec3d900001
Merge pull request #513 from protobuf-c/edmonds/issue499
Fix issue #499: unsigned integer overflow
2022-07-10 20:37:15 -04:00
Todd C. Miller
0d1fd124a4 Fix regression with zero-length messages introduced in protobuf-c PR 500.
[edmonds: Import bugfix from
b6a6451482.patch.]
2022-07-10 20:09:23 -04:00
10054172
289f5c18b1 Fix issue #499: unsigned integer overflow
Signed-off-by: 10054172 <hui.zhang@thalesgroup.com>
2022-07-10 20:02:21 -04:00
Robert Edmonds
fc9b2b2ea9
Merge pull request #508 from millert/master
Only shift unsigned values to avoid implementation-specific behavior.
2022-07-10 19:57:15 -04:00
Todd C. Miller
6e389ce2c3 Only shift unsigned values to avoid implementation-specific behavior.
This converts the arithmetic shifts to logical shifts.
It is based in part on a stackoverflow answer by John Schultz,
https://stackoverflow.com/questions/4533076/google-protocol-buffers-zigzag-encoding
2022-06-06 13:57:38 -06:00
Sinan Kaya
d3651a3c50 Makefile.am: change link order
protoc depends on protobuf libraries for execution. Order libraries
accordingly. Observing link errors with yocto's meta-mingw project
during static linkage.

Signed-off-by: Sinan Kaya <sinan.kaya@microsoft.com>
2021-08-11 14:49:42 +03:00
Ivan KOLESNIKOV
500256bb37 Replace more CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR 2021-07-28 14:26:58 +02:00
Ivan KOLESNIKOV
6957eb54eb Use CMAKE_CURRENT_BINARY_DIR instead of CMAKE_BINARY_DIR to improve compatibility (especially with building using add_subdirectory) 2021-07-28 13:36:37 +02:00
Robert Edmonds
f224ab2eeb ChangeLog: 1.4.0 v1.4.0 2021-05-18 20:45:28 -04:00
Robert Edmonds
a124b38608 Bump version to 1.4.0 2021-05-18 20:28:48 -04:00
Levi Morrison
9fd8df92ca Export and install CMake targets
The steps to add this functionality are from the cmake tutorial:
https://cmake.org/cmake/help/latest/guide/tutorial/index.html

The include directories being set on the targets is necessary
for dependent targets. There is some redundancy with the
INCLUDE_DIRECTORIES calls alreday present, but I left it alone
to make the PR smaller and more approachable.

The project currently uses mixed cases in functions. This uses
lowercase on calls I touched, as this is what CMake documentation
uses and seems to be the preferred way.

I also started wrapping long lines, as some of the lines I touched
were over 170 characters.

I tested this on both Mac OS 10.15 Catalina and CentOS 7 (with
devtoolset-7) with CMake 3.10.3.
Will work on tests in CI next.
2021-04-12 18:42:47 -06:00
Ilya Lipnitskiy
9c0fdd12c3
Merge pull request #471 from protobuf-c/ga-pr
Run GitHub actions also on pull requests
2021-04-09 20:00:55 -07:00
Ilya Lipnitskiy
50851e47bc
Run GitHub actions also on pull requests
The push trigger didn't seem to work for PRs based in outside repos. So
limit the push trigger to master and next and enable a PR trigger.
2021-04-09 19:48:17 -07:00
Robert Edmonds
7c6b54b162
Merge pull request #467 from protobuf-c/issue-440
protobuf-c.c: fix packed repeated bool parsing
2021-04-06 20:18:34 -04:00
Robert Edmonds
1b6519e4a8
Merge pull request #466 from protobuf-c/options
protoc-c: add custom options support
2021-04-06 20:16:02 -04:00
Robert Edmonds
5ae0762b85
Merge branch 'next' into options 2021-04-06 19:57:36 -04:00
Robert Edmonds
53004955b0
Merge pull request #463 from protobuf-c/wiretype
protobuf-c: don't use ProtobufCWireType internally
2021-04-06 19:12:44 -04:00
Robert Edmonds
760c5daf03
Merge pull request #459 from protobuf-c/issue-458
protoc-c: fix shared lib build on windows, migrate from Travis CI to GitHub Actions
2021-04-06 18:31:47 -04:00
Ilya Lipnitskiy
733ae77e23
protobuf-c.c: fix packed repeated bool parsing
From https://developers.google.com/protocol-buffers/docs/proto3#updating:
  int32, uint32, int64, uint64, and bool are all compatible – this means
  you can change a field from one of these types to another without
  breaking forwards- or backwards-compatibility. If a number is parsed
  from the wire which doesn't fit in the corresponding type, you will
  get the same effect as if you had cast the number to that type in C++
  (e.g. if a 64-bit number is read as an int32, it will be truncated to
  32 bits).

Until this fix, protobuf-c did not conform to the rule above when it
came to deserializing non-boolean packed repeated data into a
protobuf_c_boolean array. Fully scan the varint and use parse_boolean to
truncate the resulting value.

Fixes #440
2021-03-28 12:27:51 -07:00
Ilya Lipnitskiy
7df109917a
protoc-c: add c_package option
This option allows to override the top-level 'package' setting, or even
remove the package prefix altogether (if set to "").

Fixes #322
2021-03-21 21:11:51 -07:00
Ilya Lipnitskiy
4f39ca6e0c
protoc-c: don't use FullName helpers for non-full names
FullName* methods are designed to split a full name based on '.' in the
name. name() does not have '.' separators, so call CamelToLower and
CamelToUpper in place of FullNameToLower and FullNameToUpper.
2021-03-21 21:11:50 -07:00
Ilya Lipnitskiy
1b4e45e445
protoc-c: remove dead code 2021-03-21 21:11:50 -07:00
Ilya Lipnitskiy
f486c8ed66
protoc-c: add use_oneof_field_name option
Allows for generic oneof offset lookups based on the name of the oneof,
instead of having to know the field name. All oneof fields should have
the same offset, since they are members of a union.

Fixes #204
2021-03-21 21:11:50 -07:00
Ilya Lipnitskiy
dfb6e300fa
protoc-c: add const_strings option
Keep default as false to preserve backwards compatibility.

Fixes #239
2021-03-21 21:11:50 -07:00
Ilya Lipnitskiy
cebe3d03f9
protoc-c: add string as bytes option
Allows treating proto strings as ProtobufCBinaryData to work around
limitations such as NULL characters in strings, which are allowed in
protobuf, but not allowed in 'char *' types.

Fixes #203
2021-03-21 21:11:50 -07:00
Ilya Lipnitskiy
6962695641
protoc-c: add option to customize base field name
Fixes #287
2021-03-21 21:11:50 -07:00