Commit Graph

6119 Commits

Author SHA1 Message Date
Yilun Chong
5a95666f6e fix filename and newline 2018-08-08 11:24:09 -07:00
Yilun Chong
9bbc4b1fab
Merge pull request #4981 from BSBandme/fix_js_skipgroup
Fix js reader.js's skipGroup
2018-08-08 11:01:53 -07:00
Feng Xiao
0483feb6e0
Merge pull request #5013 from prSquirrel/fix-typo-field-mask-tree
Fix typo in FieldMaskTree.java warning
2018-08-07 17:47:57 -07:00
Adam Cozzette
f504d95d46
Merge pull request #5010 from batradhruv/4593
#4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
2018-08-07 12:05:29 -07:00
Aleksej Kazmin
5ddc6874e4
Fix typo in FieldMaskTree.java warning 2018-08-07 17:46:34 +03:00
Paul Yang
fba5ef410a
Python wheel kokoro dev (#5002)
* Add config for building python wheel

* Update submodules

* Fix setup.py to use c++11

* Fix syntax error

* Fix syntax error

* Add dir for artifact

* Update artifact dirctory

* Remove python 3.3

* Clean up virtual env

* Clean up env

* Test environment

* Test env variable

* Automatic update version number

* Remove dependency on python-wheel branch
2018-08-06 22:07:52 -07:00
Dhruv
526b350199 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs 2018-08-07 08:03:57 +08:00
dmaclach
3389bd965b Add header need for module maps.
If you make up a module map for Objective C protocol buffers, the compiler will complain about missing a declaration for GPBUnknownFieldSet which is used in this file.
2018-08-06 18:41:22 -04:00
Feng Xiao
62fc66ada3
Merge pull request #5005 from finaldie/python.gitignore
Ignore python .egg file to make git status clean #5004
2018-08-06 13:34:13 -07:00
Yuzhang Hu
9c7655c9fc Ignore python .egg file to make git status clean #5004 2018-08-05 02:58:30 -07:00
Paul Yang
770dde7d31
Update php package.xml to 3.6.1 (#5000) 2018-08-03 16:26:18 -07:00
Feng Xiao
199d6f6ea8
Merge pull request #4997 from jtattermusch/backport_nuget_building
Backport building C# nuget to 3.6.x branch
2018-08-03 12:11:19 -07:00
Jan Tattermusch
149e31a6c0 upgrade dotnet SDK to 2.1.3 on kokoro linux 2018-08-03 10:01:27 +02:00
Jan Tattermusch
d754a0c478 Revert "overcome the global.json constraint with a hack"
This reverts commit c02346c72a.
2018-08-03 10:01:15 +02:00
Jan Tattermusch
2f6443edcc use SDK version available on Kokoro 2018-08-03 10:01:00 +02:00
Jan Tattermusch
937884476e overcome the global.json constraint with a hack 2018-08-03 10:00:50 +02:00
Jan Tattermusch
9d0b9e4ea0 fix build_nuget.bat 2018-08-03 10:00:35 +02:00
Jan Tattermusch
6fd12a076d add scripts for automated building of C# nuget on Kokoro 2018-08-03 09:59:37 +02:00
johnlow95
e9a5412afc adding of hyperlink of the PHP (#4985) 2018-08-02 19:49:44 -07:00
Adam Cozzette
04faf482bc
Merge pull request #4990 from acozzette/aarch64-build
Added support for building the aarch64 and ppcle64 protoc binaries with Kokoro
2018-08-01 16:11:23 -07:00
Yilun Chong
600e4e5f3b fix 2018-08-01 15:39:03 -07:00
Adam Cozzette
377f64f82f Added support for building the aarch64 and ppcle64 protoc binaries with Kokoro
This was fairly straightforward using the existing build-protoc.sh
script. The only problem I ran into was that the x86 Docker builds
create output directories owned by root, which caused some permission
issues. Fortunately it was easy to get around that just by doing those
Docker builds last.
2018-08-01 15:01:05 -07:00
Adam Cozzette
21fc01b63c
Merge pull request #4991 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
2018-08-01 14:56:08 -07:00
Adam Cozzette
94d55e5292 Merge branch '3.6.x' into merge-3-6-x 2018-08-01 13:44:55 -07:00
Yilun Chong
1bec76f04c fix 2018-08-01 13:24:54 -07:00
Yilun Chong
2ab6cb4570 fix 2018-08-01 10:06:27 -07:00
Yilun Chong
ed1cd2c5c6 fix 2018-07-31 15:14:08 -07:00
Adam Cozzette
3d62db3ecd
Merge pull request #4979 from ripopov/fix-tests-mingw-w64
tests: fix link failure and stack overflow on Mingw w64
2018-07-31 13:25:22 -07:00
Yilun Chong
82a4e4e3d3 Fix js reader.js's skipGroup 2018-07-31 11:35:48 -07:00
Roman Popov
a69dfe63bc tests: fix link failure and stack overflow on Mingw w64 2018-07-30 21:55:44 -07:00
vijay-bhatt
0f56f27ffc Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4825)
* Ignore unknown enum received in json when ignoreUnknownFields flag is set.
2018-07-30 13:36:46 -07:00
Yilun Chong
751bf9783f
Merge pull request #4974 from BSBandme/fix_benchmark
fix third_party/benchmark submodule init
2018-07-30 11:43:15 -07:00
Petros Pissias
f6a7ca1867 Update third party RPC implementations list (#4977)
I have added the xsrpcj RPC implementation for java
2018-07-30 10:34:57 -07:00
Adam Cozzette
90e2c29e4a
Updated release documentation (#4973)
I made a few small fixes to the documentation related to publishing
protoc artifacts:
- The target directory for Mac should be called osx instead of macos.
- There needs to be a directory for aarch_64.
- We need to avoid calling "mvn clean" inside the protoc-artifacts
  directory, since that will delete the contents of the target/
  subdirectory.
2018-07-30 09:30:08 -07:00
Yilun Chong
517dee8da3 fix third_party/benchmark init 2018-07-27 17:59:19 -07:00
Adam Cozzette
48cb18e5c4 Updated change log for 3.6.1 release 2018-07-27 13:30:28 -07:00
Adam Cozzette
9e1286b949 Updated version numbers to 3.6.1 2018-07-27 13:30:28 -07:00
Paul Yang
8705adc228
Give a specific category to each test. (#4965)
* Give a unique category to each test.

This change introduce a TestCategory enum to ConformanceRequest. Existing tests
are divided into three categories: binary format test, json format test and json
format (ignore unknown when parsing) test. For the previous two categories, there
is no change to existing testee programs. For tests with the last category, testee programs
should either enable ignoring unknown field during json parsing or skip the test.

* Fix python test

* Fix java

* Fix csharp

* Update document

* Update csharp generated code
2018-07-27 12:24:42 -07:00
Paul Yang
bdcbcabe5e
Add conformance test for php c back (#4966)
* Add conformance test for php c back

php c extension has different result for conformance test for different
php version and architecture. Try to add conformance back for php 7.1 c extension first.

* Disable conformance test for c extension on 32-bit architecture
32-bit and 64-bit have different failing tests

* Fix typo
2018-07-26 13:52:22 -07:00
Jonathan Haber
964201af37 Store the class object itself (#4927)
* Store the class object itself

* Add test for backwards compatibility

* Rename and add test

* Add comments
2018-07-23 13:45:22 -07:00
Feng Xiao
bc2364c613
Merge pull request #4956 from mkosieradzki/patch-1
Added support for Visual Studio 2017 in gitignore
2018-07-23 13:35:41 -07:00
Arun Olappamanna Vasudevan
c7e0e262a6 pyext needs c++11 in linux and mac. (#4930) 2018-07-23 13:35:15 -07:00
Timothy Younger
5134f1a340 Update Composer config in PHP module (#3829)
* Prevents installation of `phpunit/phpunit:^6` because the test cases in this project require `\PHPUnit_Framework_TestCase` which was removed in v6. Moves generated PHP classes for tests into autoload-dev so that they are not referenced in the dist autoload. Adds Composer scripts to run protoc with and without grpc.

* update composer test target to use the same commands as generate_php_test_proto in tests.sh
2018-07-23 13:33:23 -07:00
Paul Yang
e508fc0c66
Check the message to be encoded is the wrong type. (#4885) (#4949)
* Check the message to be encoded is the wrong type. (#4885)

* Change TypeError to ArgumentError
2018-07-23 11:05:28 -07:00
Feng Xiao
2dcd6ae409
Remove/replace travis references (#4953)
* Remove/replace travis references.
2018-07-22 17:14:24 -07:00
mkosieradzki
d6775fa8d6
Added support for Visual Studio 2017 in gitignore 2018-07-22 11:00:35 +02:00
Ryland Degnan
5b7d0dc8aa Update options.md (#4952)
Added Netifi Proteus to Registered Extensions
2018-07-21 08:34:17 -07:00
Yilun Chong
a7071291c7 Add JS and Protobuf.js benchmark 2018-07-20 16:13:19 -07:00
Leonard Hecker
e7746f487c php: Added nanosecond support for Timestamp (#3972)
* php: Added nanosecond support for Timestamp

* php: Fixed compatibility test
2018-07-20 13:03:00 -07:00
Paul Yang
fc90fd6df1
Make assertEquals pass for message (#4947)
This change only makes assertEquals pass for message in c extension. However, it actually does nothing.
This is the same behavior before 3.6.0 release.
2018-07-20 11:03:46 -07:00