Thomas Van Lenten
d9048081b2
Remove the non prefix validation options from Options.
...
The other generation options never were in the Options structure and
ImportWriter was the only thing that needed some the non validation options and
it already required directly passing the options. So refine Options to just be
validation options and bundle all the File related generation options into
a new FileGenerator specific GenerationOptions.
2022-03-01 10:46:27 -05:00
Thomas Van Lenten
14e445bc34
Stop passing generation options thru the graph.
...
They never were needed below file, and they really are specific to two high
level case, so don't pass them every where else.
2022-03-01 10:46:27 -05:00
Deanna Garcia
933239f8c3
Update build files
2022-03-01 00:27:42 +00:00
deannagarcia
c578f59fc8
Merge pull request #9558 from protocolbuffers/exe-extensions
...
Change toolchain artifact name patterns
2022-02-28 12:51:03 -08:00
Deanna Garcia
93b4fa6fc7
Only exe extension for windows
2022-02-28 20:00:45 +00:00
Deanna Garcia
aafcb92f62
kotlin core maven export
2022-02-28 18:28:50 +00:00
なつき
6c8bda86fe
Suppress warning for intentional circular require
2022-02-27 13:15:57 -08:00
Greg Miller
cbc9826db7
Merge pull request #9555 from devjgm/ignore-clangd-files
2022-02-26 15:15:52 -05:00
Greg Miller
ee429aea17
chore: gitignore ephemeral files that clangd uses
...
This PR tells git to ignore ephemeral files that are created when
developers use clangd.
clangd needs a `compile_commands.json` file at the root of the repo (or
in a `build/` directory) to tell it how to compile each file. CMake can
generate this file with something like the following:
```console
$ cmake -Scmake -B.build \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-Dprotobuf_BUILD_TESTS=OFF
$ ln -sf .build/compile_commands.json .
```
Then clangd will compile and index files into the `.cache` directory.
2022-02-25 21:13:50 -05:00
Adam Cozzette
b44784cf30
Fix update_version.py script ( #9554 )
...
Two small fixes to update_version.py:
- The regex for updating SOVERSION in cmake files was not quite right. I
fixed it to reflect that the value is a plain integer and not of the
form x.y.z
- For some reason the code for updating PHP_PROTO_VERSION appeared 3
times and led to a spurious warning, so I removed the extra calls
there.
2022-02-25 15:30:07 -08:00
Jason Lunn
1a10c58c2f
Merge pull request #9549 from JasonLunn/jruby-release-bump
...
Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0.
2022-02-25 17:12:30 -05:00
deannagarcia
4738b8ee08
Merge pull request #9553 from protocolbuffers/deannagarcia-patch-2
...
Make protoc executable names consistent
2022-02-25 10:47:07 -08:00
deannagarcia
5b3f853d7d
Make protoc executable names consistent
...
Rename ppc64 cpu to ppcle_64 to match current release.
2022-02-25 10:45:28 -08:00
Dimitris Koutsogiorgas
89c40311db
Rename proto_package_to_prefix_mappings_path
to package_to_prefix_mappings_path
.
2022-02-25 13:10:36 -05:00
deannagarcia
b9bcec8ac3
Merge pull request #9537 from protocolbuffers/deannagarcia-patch-1
...
Fix package naming rule
2022-02-25 09:47:41 -08:00
Jason Lunn
df0999141e
Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0.
2022-02-25 14:11:12 +00:00
Thomas Van Lenten
6a77c9bab4
Make the ObjC support conditional to darwin.
...
Fixes #9392
2022-02-24 17:39:04 -05:00
Thomas Van Lenten
e8470340e0
Rename ExpectedPrefixesCollector to PackageToPrefixesCollector
...
Now that two files use the format, tweak the naming to the format for the file
vs. the usage(s).
Also add a "usage" param so the two places can provide a little context for any
error messages generated while parsing.
2022-02-24 16:11:10 -05:00
deannagarcia
a5168a6e96
Fix package naming rule
...
Remove quotes around CPU since we want the variable evaluated instead of the string. This will allow the win64 build to get the correct name.
2022-02-23 16:45:56 -08:00
Dimitris Koutsogiorgas
a112c4ab96
Add prefix_to_proto_package_mappings_path
ObjC option.
2022-02-23 14:26:53 -05: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
Dimitris Koutsogiorgas
db56692883
Revert "objective-c: Add objc_class_prefix
generation option."
...
This reverts commit b5ab0b7a18
.
2022-02-22 14:24:41 -05:00
Jorg Brown
2f91da585e
Merge pull request #9528 from dlj-NaN/sync-stage
...
Integrate from Piper for C++, Java, and Python
2022-02-18 15:32:19 -08:00
David L. Jones
951582e893
Update changelog
2022-02-18 14:07:43 -08:00
David L. Jones
7ba5fa3d96
Merge tag 'refs/tags/sync-piper' into sync-stage
2022-02-18 14:02:13 -08:00
David L. Jones
3ab97ce830
Sync from Piper @429642851
...
PROTOBUF_SYNC_PIPER
2022-02-18 14:02:12 -08:00
Jorg Brown
763d85293d
Merge pull request #9525 from dlj-NaN/sync-stage
...
Integrate from Piper for C++, Java, and Python
2022-02-18 12:15:58 -08:00
deannagarcia
ddfc233f57
Merge pull request #9524 from protocolbuffers/sysroot
...
Change sysroot flags
2022-02-18 11:02:52 -08:00
David L. Jones
20c5b6fd14
Update changelog
2022-02-17 18:01:44 -08:00
David L. Jones
2fbda76fad
Sync from Piper @429445371
...
PROTOBUF_SYNC_PIPER
2022-02-17 18:00:38 -08:00
Deanna Garcia
cf05c9f84f
Change sysroot flags
2022-02-18 00:39:23 +00:00
Jorg Brown
2f7ee91e32
Merge pull request #9522 from dlj-NaN/sync-stage
...
Integrate from Piper for C++, Java, and Python
2022-02-17 11:38:09 -08:00
David L. Jones
a6c9a5f69d
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# src/google/protobuf/compiler/java/java_message.cc
# src/google/protobuf/compiler/java/java_message_lite.cc
2022-02-17 09:54:12 -08:00
David L. Jones
1ba1d73e0d
Sync from Piper @429333699
...
PROTOBUF_SYNC_PIPER
2022-02-17 09:53:51 -08:00
deannagarcia
972b122a30
Merge pull request #9518 from alexvanyo/patch-1
...
Add test scope to kotlin-test for protobuf-kotlin-lite
2022-02-17 09:24:03 -08:00
Alex Vanyo
97d78281de
Add test scope to kotlin-test for protobuf-kotlin-lite
2022-02-16 23:25:12 -06:00
Joshua Haberman
b0bf163c78
Merge pull request #9510 from haberman/manylinux-aarch64
...
Changes to build aarch64 under manylinux.
2022-02-16 10:02:47 -08:00
Joshua Haberman
9d01899322
Changes to build aarch64 under manylinux.
2022-02-15 18:02:10 -08:00
deannagarcia
8bfa7d0083
Merge pull request #9508 from protocolbuffers/genProtoRule
...
Use internal kotlin gen rule
2022-02-15 16:05:21 -08:00
Deanna Garcia
0f253ca64f
Remove deleted files from Makefile
2022-02-15 23:03:12 +00:00
Deanna Garcia
67b74dd169
Use internal kotlin gen rule
2022-02-15 22:45:56 +00:00
idodod
2a2a9b6e64
Update third_party.md ( #9505 )
2022-02-15 07:22:53 -08:00
deannagarcia
479500a091
Merge pull request #9496 from protocolbuffers/duplicates
...
Remove Proto3LiteTest.kt
2022-02-14 10:45:02 -08:00
deannagarcia
9eb5b19964
Merge pull request #9494 from protocolbuffers/ktExport
...
Fixing Kotlin tests
2022-02-14 10:44:16 -08:00
Adam Cozzette
250fafa7c4
Fix the benchmark job and delete old Python configs ( #9497 )
...
Our benchmark job starting failing when we stopped supporting Python 3.5
and 3.6, but this change fixes it by running it in our java_stretch
Docker container, which has a more recent Python version. I also deleted
all configs related to old Python versions that we no longer support.
2022-02-11 16:25:56 -08:00
ObsidianMinor
013e115231
Add an option to preserve proto names in JsonFormatter ( #6307 )
...
Co-authored-by: Adam Cozzette <acozzette@google.com>
2022-02-11 15:55:46 -08:00
Deanna Garcia
79848b5f4c
Update Makefile
2022-02-11 23:41:41 +00:00
Deanna Garcia
14c62a025c
Removing Proto3LiteTest
2022-02-11 23:15:08 +00:00
Deanna Garcia
f1085e9bbc
Remove old import
2022-02-11 22:26:07 +00:00
Deanna Garcia
a32a2a3b57
Fix errors
2022-02-11 22:12:51 +00:00