diff options
Diffstat (limited to 'third_party/protobuf/README.md')
| -rw-r--r-- | third_party/protobuf/README.md | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/third_party/protobuf/README.md b/third_party/protobuf/README.md index 207eec076d..68fc1b1bf9 100644 --- a/third_party/protobuf/README.md +++ b/third_party/protobuf/README.md @@ -19,19 +19,23 @@ rm -rf .git .gitignore .gitmodules the jars instead. To do that, in the BUILD file delete the rules listed under `Java support`. Then, from the `third_party/protobuf/<old_proto>/BUILD file` copy the rules under "Modifications made by bazel" to the new BUILD file. - The java rules in there should have the same names as the ones you just deleted under "Java support". + The java rules in there should have the same names as the ones you just deleted under "Java support". You might need to update the names of the jars in the rules sources to the ones you just build. -4) Copy `third_party/protobuf/com_google_protobuf_java.BUILD` to the new +4) Copy `third_party/protobuf/<old_proto>/com_google_protobuf_java.BUILD` to the new directory. -5) Name the `new_proto` directory according to the protobuf version number. -5) In `third_party/protobuf/BUILD` update PROTOBUF_VERSION to the name of the +5) Copy the `licenses` declaration and the `srcs` filegroup from + `third_party/protobuf/<old_proto>/util/python/BUILD` to the corresponding + file in the new directory. +6) For each file listed in `RELATIVE_WELL_KNOWN_PROTOS` in the `new_proto/BUILD` file + copy it from `new_proto/srcs/google/protobuf` to `new_proto/google/protobuf`. +7) Name the `new\_proto` directory according to the protobuf version number. +8) In `third\_party/protobuf/BUILD` update `PROTOBUF\_VERSION` to the name of the directory you just created. -6) Update this file if you found the :instructions to be wrong or incomplete. +9) In the root `WORKSPACE` file update relative paths of protobuf to point to +the new version. +10) Delete the `third_party/protobuf/<old_proto>` directory. +11) Update this file if you found the :instructions to be wrong or incomplete. # Current protobuf version -The current version of protobuf was obtained from @laszlocsomor's protobuf fork -`https://github.com/laszlocsomor/protobuf` at commit `a80186eb10e027`. Once -`https://github.com/google/protobuf/pull/2969` is merged into upstream -protobuf, we no longer need to use @laszlocsomor's fork but can directly clone -upstream. +The current version of protobuf is [3.4.0](https://github.com/google/protobuf/releases/tag/v3.4.0). |