Commit Graph

6482 Commits

Author SHA1 Message Date
Bo Yang
33dd96c23f Use mktime 2019-03-28 06:38:20 +00:00
Bo Yang
262cc06075 Fix ruby conformance test on mac 2019-03-28 06:35:07 +00:00
Bo Yang
2d9507ec74 Update upb for ruby 2019-03-28 02:17:39 +00:00
Bo Yang
a268b63284 Update upb for ruby 2019-03-27 21:19:01 +00:00
Bo Yang
cd044e9cbb Sync latest upb changes 2019-03-27 18:15:24 +00:00
Adam Cozzette
8645d893ab Merge branch '3.7.x' into merge-3-7-x 2019-03-26 14:32:20 -07:00
Paul Yang
6973c3a504
Update version number to 3.7.1 (#5947)
* Update version number to 3.7.1

* Update version number in port_def.inc
2019-03-26 09:30:12 -07:00
Adam Cozzette
077079573f Fixed CI failures with Ruby 2.3 on OSX (#5948)
OSX has deprecated OpenSSL, so we need to install it via Homebrew and
build against that version when we build Ruby.
2019-03-25 17:19:48 -07:00
Benjamin Peterson
5939bc3619 Fix "the the". 2019-03-25 13:38:06 -07:00
Adam Cozzette
34b64995ac Avoid linking against libatomic when building protoc (#5922)
We ran into problems with precompiled protoc binaries not working on
some systems because of the dependence on a dynamically linked
libatomic. However, I found that linking against libatomic is not
actually necessary in our protoc build environment. Inside configure.ac
there's a test which figures out if we need to pass -latomic, and it
does this by attempting to build a test binary. That binary was failing
to build, but it turns out this was because we need to pass -std=c++11,
not -latomic.

This fixes #5875.
2019-03-25 11:00:19 -07:00
Paul Yang
ba42cb53d9
Allow bytes field to be longer than 16000 bytes (#5924)
* Allow bytes field to be longer than 16000 bytes

* Remove empty line
2019-03-25 10:51:18 -07:00
Adam Cozzette
02cf61a7da Updated NPM version to 3.7.1 2019-03-25 09:52:46 -07:00
myd7349
ec0d47e4d2 No define strtoll/strtoull for VS2013 and above 2019-03-25 09:52:00 -07:00
Adam Cozzette
b3c132f6f3 Avoid marking generated C++ messages as final for now (#5928)
We need to mark messages as final soon, but before we do that we need to
provide a temporary opt-out mechanism to accommodate existing code that
inherits from generated messages. For 3.7.1 let's stop marking messages
final but in 3.8 we can reintroduce "final" with an opt-out option.
2019-03-25 09:37:06 -07:00
Hao Nguyen
3a3956e8a2
Merge pull request #5921 from haon4/contributing
Down integrate to Github
2019-03-21 15:24:08 -07:00
Daniel Kurka
38679c6afe Remove unused import in message.js. 2019-03-21 15:12:28 -07:00
Daniel Kurka
059851fe59 Remove unused import from message. 2019-03-21 15:11:56 -07:00
Daniel Kurka
e2461b5f59 Revert "Remove unused f expression from jscode gen. (#5573)"
The removed variable here is actually used breaking downstream bazel
builds.
2019-03-21 14:35:25 -07:00
Mickaël Schoentgen
ed10d9cf6d Fix several DeprecationWarning: invalid escape sequence (#5897)
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-03-21 11:51:14 -07:00
Adam Cozzette
a0a8c6cd77 Fix Windows builds with future Bazel changes
The bazel-bin/ and bazel-genfiles/ directories are going to be merged
soon. That change was causing some test failures on Windows, and I
believe it is because the logic for locating test data files was getting
confused and mistakenly looking for them under bazel-bin/. This commit
updates that logic to look for a more specific file (descriptor.cc)
which does not appear under any Bazel-related directories.

It sounds like the more official solution is to use the Bazel runfiles
library (i.e. //tools/cpp/runfiles). However, I decided not to do that
because we currently still support multiple build systems, and if we
used a separate solution for Bazel then I suspect we would need even
more #ifdefs in the code to handle the different systems.
2019-03-21 11:07:32 -07:00
Adam Cozzette
e6779e9b2a Added io_win32.h to header list in CMake config
This should fix #5717 and ensure that this header gets installed
properly on Windows.
2019-03-21 10:30:37 -07:00
Hao Nguyen
71f2996d7c Update generated descriptor files 2019-03-20 15:39:36 -07:00
Hao Nguyen
1a3fa5d9eb Update conformance test failures 2019-03-20 14:43:42 -07:00
Hao Nguyen
507c6df017 Undelete python/google/protobuf/pyext/proto2_api_test.proto that was accidentally removed from file_list 2019-03-20 12:04:57 -07:00
Hao Nguyen
d47c3e9258 Fix CMake conflict 2019-03-20 11:51:42 -07:00
Hao Nguyen
81567d89a9 Merge branch 'contributing' of https://github.com/haon4/protobuf into contributing 2019-03-20 11:46:11 -07:00
Hao Nguyen
2f864fdfdf Down integrate to Github 2019-03-20 11:45:01 -07:00
Joe Bolinger
5e0812d4b1 Allow Java reserved keywords to be used in extensions (#5709)
* add check for reserved keywords in extensions

* add all reserved keywords

* use string without std::

* add test and update name in lite version

* test updates
2019-03-20 09:50:04 -07:00
Paul Yang
57b6597f46
Replace strptime with custom implementation (#5906)
* Replace strptime with custom implementation

* Fix ruby strptime

* Fix test

* Fix ruby conformance test

* Use mktime

* Remove EmptyFieldMask from failed conformance test list
2019-03-19 22:27:13 -07:00
Jan Tattermusch
ec3d94819d add System.Memory dependency (#5835)
also add useful Span-based methods for ByteString
2019-03-18 16:28:02 -07:00
Paul Yang
68cd8e8ba2
Merge pull request #5908 from protocolbuffers/revert-5014-iterator-deprecation-fix
Revert "Updating Iterators to be compatible with C++17 in MSVC"
2019-03-18 14:21:05 -07:00
Hao Nguyen
cb8a46b529
Merge pull request #5912 from haon4/contributing
Update CONTRIBUTING.md to recommend applying the appropriate labels
2019-03-18 13:45:57 -07:00
Hao Nguyen
9e620595d4 Update CONTRIBUTING.md to recommend applying the appropriate labels 2019-03-18 13:33:08 -07:00
Paul Yang
12f8fe8911
Revert "Updating Iterators to be compatible with C++17 in MSVC" 2019-03-18 10:02:23 -07:00
Paul Yang
032a179e47
Fix macros in header of generated code (#5881)
* Fix macros in header of generated code

* Define PROTOBUF_MIN_PROTOC_VERSION in port_def.inc
* Remove duplicated GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION from common.h

* Send error if the error has been defined

* Undef the new macro
2019-03-15 11:17:23 -07:00
Jan Tattermusch
b68a347f56
Merge pull request #5898 from jskeet/non-packable
Make the C# benchmarks non-packable
2019-03-15 11:41:25 +01:00
Jon Skeet
2de68bc33a Make the C# benchmarks non-packable 2019-03-15 09:39:50 +00:00
Paul Yang
4fd0579e47
Merge pull request #5896 from jbolinger/error-to-3.7.x
Ruby error messages in 3.7.x
2019-03-14 22:21:17 -07:00
Joe Bolinger
580826cd97 cherry-pick test fix from #5853 2019-03-14 16:32:01 -07:00
Jan Tattermusch
f071c9e0f3 fix source stepping by upgrading sourcelink (#5891) 2019-03-14 14:58:35 -07:00
Joe Bolinger
604121aaa4 fix tests for older rubies 2019-03-14 11:42:22 -07:00
Joe Bolinger
1cf730cb22 add type errors test to Makefile.am 2019-03-14 11:37:39 -07:00
Joe Bolinger
0114727cc6 add more descriptive error messages to init methods 2019-03-14 11:37:39 -07:00
Jan Tattermusch
36fa3c6d4d add missing C# windows presubmit.cfg file (#5894) 2019-03-14 09:47:33 -07:00
David Supplee
d65b8647f2 Add terminating character to zend_lookup_class call (#5871) (#5885)
* add terminating character

* adjust name length input

* add test cases

* correct script name

* Misc fixes

* add new script to EXTRA_DIST list
2019-03-13 13:31:55 -07:00
Jon Skeet
66fb3ce5fc Add C# benchmark files to EXTRA_DIST in Makefile.am 2019-03-13 15:26:57 +00:00
Jon Skeet
233f4865ee First pass at benchmarking for C# 2019-03-13 15:26:57 +00:00
Jan Tattermusch
db1d4dc4c1
Merge pull request #5876 from jtattermusch/csharp_win_tests
C# testing improvements
2019-03-13 07:27:29 +01:00
Paul Yang
207d01daa1
Remove GPBWrapperUtil from generated code (#5880)
* Remove GPBWrapperUtil from generated code

* Add newline
2019-03-12 22:33:13 -07:00
David Supplee
93533f780b Add terminating character to zend_lookup_class call (#5871)
* add terminating character

* adjust name length input

* add test cases

* correct script name

* Misc fixes

* add new script to EXTRA_DIST list
2019-03-12 21:30:06 -07:00