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
Wang Kirin
e08f01ce6a
compelete fix issue 5060: change CodedOutputStream to CodedOutputStream*
2019-06-04 17:00:22 -07:00
Hao Nguyen
77f03d932a
Merge pull request #6201 from haon4/3.8.x-201905311515
...
Merge 3.8.x into master branch
2019-06-01 11:27:57 -07:00
Carmi Grushko
5c25f41423
Add protobuf_java_lite
Bazel target
...
that builds the JavaLite runtime.
Contents based on java/lite/pom.xml.
2019-06-01 12:08:53 +03:00
Steven Peters
232d061743
remove comment about wire_format_lite_inl.h
...
The wire_format_lite_inl.h header file was made unnecessary in #5839
and deleted in #5921 , so remove the comment about it.
2019-05-31 15:46:04 -07:00
Hao Nguyen
ca7ae5215f
Merge pull request #6202 from haon4/update_contributing
...
Update CONTRIBUTING.md to clarify who should set the labels
2019-05-31 15:43:09 -07:00
Hao Nguyen
e06c5ff780
Update CONTRIBUTING.md
2019-05-31 15:32:02 -07:00
Hao Nguyen
634d704d23
Merge branch '3.8.x' into 3.8.x-201905311515
2019-05-31 15:18:39 -07:00
Wang Kirin
74f4f594cf
fix typos in examples/README.md
2019-05-31 14:26:20 -07:00
Hao Nguyen
da5d02bced
Merge pull request #6199 from haon4/201905301330
...
Down integrate to GitHub
2019-05-31 09:53:51 -07:00
Hao Nguyen
010320f780
Add dependency to truth in test
2019-05-31 07:54:53 -07:00
Hao Nguyen
0a67788a46
Include the new Java util files in Makefile.am
2019-05-31 06:26:08 -07:00
Hao Nguyen
044c766fd4
Down integrate to GitHub
2019-05-30 13:31:15 -07:00
Thomas Van Lenten
beaeaeda34
Use runtime_error vs just exiting for some issues.
...
release notes: no
2019-05-29 15:58:09 -04:00
Amit Portnoy
37297b25f6
avoid error when compiling with MSVC2010
...
I'm getting `src/google/protobuf/map_field.cc(284): error C2899: typename cannot be used outside a template declaration`
removing `typename` fixes the issue
2019-05-28 11:09:41 -07:00
Keith Smiley
ca3ead7745
Move tool out of inputs in bazel config
...
This fixes compatibility with bazel when passing `--incompatible_no_support_tools_in_action_inputs` which will be flipped in an upcoming release.
2019-05-28 10:46:14 -07:00
Hao Nguyen
09745575a9
Merge pull request #6160 from haon4/3.8.x-20190521140707
...
Update protobuf version to 3.8.0
2019-05-24 11:06:49 -07:00
Hao Nguyen
303191d892
Merge pull request #6173 from haon4/cherrypick_fix_build
...
Fix gulpfile to use gulp 4 API
2019-05-24 10:12:57 -07:00
Paul Yang
95c207f24e
Add use_nested to internalAddGeneratedFile for php implementation ( #6117 )
2019-05-24 10:01:58 -07:00
Paul Yang
9a8ef05a34
Append field number to accessors if there is conflict ( #6169 )
...
Previously, foo_value and foo (wrapper field) will both have get/setFooValue
2019-05-24 10:00:09 -07:00
Alex Konradi
b44a1364ec
Add extension number for protoc-gen-validate
...
This project is used by the [Envoy proxy](https://www.envoyproxy.io/ ) and several others.
The existing code is using the extension value [919191](54b08a686f/validate/validate.proto (L29)
) but since maintaining binary compatibility is not important, it shouldn't be a problem to change once this allocation is approved.
2019-05-24 07:44:51 -04:00
Hao Nguyen
f9cd7bd9b3
Upgrade gulp version
2019-05-23 16:31:06 -07:00
Hao Nguyen
6d83327a86
Fix gulpfile to use gulp 4 API
2019-05-23 15:24:02 -07:00
Hao Nguyen
affe9c200a
Merge pull request #6161 from haon4/201905211601
...
Down integrate to GitHub
2019-05-22 14:30:49 -07:00
Hao Nguyen
e038b1e7c0
Merge pull request #6164 from haon4/cherrypick_fix_build
...
Cherrypick 014872a962
to fix build
2019-05-22 13:55:48 -07:00
Mike Moore
565154af78
Remove Ruby to_hash methods
2019-05-22 13:21:51 -06:00
Seth Girvan
014872a962
Revert "protobuf.pc.in does not reflect CXXFLAGS"
...
This reverts commit a7180caf19
.
2019-05-22 10:56:59 -07:00
Hao Nguyen
582927ae2a
Update generated files
2019-05-21 16:42:33 -07:00
Hao Nguyen
88339fa7f8
Down integrate to GitHub
2019-05-21 16:02:13 -07:00
Hao Nguyen
b0d648664d
Update protobuf version
2019-05-21 14:07:13 -07:00
Hao Nguyen
46d5cc7de5
Revert "Revert "Add new file to package.xml ( #6116 )""
...
This reverts commit 783971e872
.
Revert an accidental revert!
2019-05-21 13:50:54 -07:00
Hao Nguyen
2352a30e66
Revert "Update protobuf version"
...
This reverts commit 6d96493b31
.
2019-05-21 13:49:06 -07:00
Hao Nguyen
783971e872
Revert "Add new file to package.xml ( #6116 )"
...
This reverts commit c40018e52d
.
2019-05-21 13:48:34 -07:00
Hao Nguyen
6d96493b31
Update protobuf version
2019-05-21 13:31:01 -07:00
Yilun Chong
0c3f43a619
Merge pull request #6158 from TechProofreader/patch-2
...
Update performance.md
2019-05-21 11:25:20 -07:00
TechProofreader
02a4c720c3
Update performance.md
...
Even though I just proofread this file, I noticed one more thing that needed correcting, which I fixed. The word "genereated" had to be corrected to "generated". My apologies for missing this on the initial check.
2019-05-21 03:18:36 -04:00
Hao Nguyen
fcfc47d405
Merge pull request #6151 from haon4/201905171200
...
Down Integrate to GitHub
2019-05-20 10:26:25 -07:00
Yilun Chong
1bc8cbe14b
Merge pull request #6153 from TechProofreader/patch-1
...
Update performance.md
2019-05-19 20:30:27 -07:00
TechProofreader
5b628d552b
Update performance.md
...
I corrected a few grammatical mistakes and increased the document's readability by easing the language flow.
2019-05-18 01:04:58 -04:00
Paul Yang
c40018e52d
Add new file to package.xml ( #6116 )
2019-05-17 15:19:46 -07:00
Hao Nguyen
66540237ca
Down integrate to GitHub
2019-05-17 12:01:17 -07:00
Yilun Chong
b4f193788c
Merge pull request #6115 from haon4/javalite_doc
...
Update instruction on how to use JavaLite runtime
2019-05-14 18:04:33 -07:00
Yilun Chong
1ded7fbb7d
Merge pull request #6138 from haoyuanli/patch-1
...
Fix typo 'pythong'
2019-05-14 17:52:15 -07:00
Joshua Haberman
d41002663f
Merge pull request #6139 from haberman/conformance-build
...
Typo fix for conformance test runner.
2019-05-14 17:05:45 -05:00
Joshua Haberman
7980ad8e1c
Merge pull request #6140 from protocolbuffers/revert-6128-convert-to-ruby
...
Revert "Convert Google::Protobuf.deep_copy to pure Ruby"
2019-05-14 17:04:54 -05:00
Joshua Haberman
d57581348d
Revert "Convert Google::Protobuf.deep_copy to pure Ruby"
2019-05-14 14:25:11 -07:00
Joshua Haberman
c659a4a4db
Fixed typo: conformance_test_runner should be a binary, not library.
2019-05-14 14:01:16 -07:00
Joshua Haberman
0acd543dc4
Merge branch 'master' into conformance-build
2019-05-14 13:59:26 -07:00
Joshua Haberman
16d0021356
Merge pull request #6128 from tenderlove/convert-to-ruby
...
Convert Google::Protobuf.deep_copy to pure Ruby
2019-05-14 13:04:30 -05:00
haoyuanli
62246b9166
Fix typo 'pythong'
...
Changed 'pythong' to 'python'
2019-05-14 10:47:09 -07:00