Commit Graph

1322 Commits

Author SHA1 Message Date
Jan Tattermusch 07d2092c79 vs2017 build fixes 2017-08-23 16:17:00 +02:00
Jan Tattermusch eb3540ec01 remove contents of /vsprojects directory 2017-08-23 07:53:18 +02:00
Stanley Cheung 5d55948c34 PHP: upmerge from 1.4.x branch 2017-08-22 13:18:14 -07:00
Muxi Yan e3d6a9a8d4 Merge pull request #12180 from grpc/revert-12086-revert-11832-objc-oauth-protocol
Revert "Revert "Add OAuth2 protocol in GRPCClient""
2017-08-22 12:18:11 -07:00
Maxim Dzoba dd962616f2 Adding a build template for generic GYP build. 2017-08-16 17:52:28 -04:00
Muxi Yan e60c0f82b5 Merge pull request #11714 from muxi/port-11712
Port #11712: Fix the nanopb's header include issue
2017-08-15 14:02:03 -07:00
Muxi Yan b82f82b725 Revert "Revert "Add OAuth2 protocol in GRPCClient"" 2017-08-14 12:01:14 -07:00
Muxi Yan f6f12de88a Revert "Add OAuth2 protocol in GRPCClient" 2017-08-04 15:30:57 -07:00
Muxi Yan ab38a3d4f4 Merge pull request #11832 from muxi/objc-oauth-protocol
Add OAuth2 protocol in GRPCClient
2017-08-03 22:40:15 -07:00
Eric Gribkoff 2b7c4ddfcc Install Android SDK tools in Dockerfile 2017-08-01 09:55:12 -07:00
Vijay Pai e00f2a312a Prevent race in trying to compile grpc.pb.cc file before pb.h exists 2017-07-31 01:04:45 -07:00
Muxi Yan 021c29ea36 Create optional subspec for GRPCCall+GID 2017-07-28 13:10:26 -07:00
Muxi Yan 8dc1b7db51 Merge pull request #11732 from muxi/update-podspecs
Advance versions of BoringSSL and protoc
2017-07-28 10:17:43 -07:00
murgatroid99 655c8b10f6 Fix Node build for older versions of Electron on Mac 2017-07-20 11:03:41 -07:00
murgatroid99 e929547d48 Fix issues with Node Mac build 2017-07-19 15:58:40 -07:00
Nicolas Noble d03b55322c Merge pull request #11760 from nicolasnoble/node-pre-gyp
Adding platform and abi tags in our node-pre-gyp.
2017-07-12 09:45:11 -07:00
Michael Lumish e908821d24 Merge pull request #11708 from murgatroid99/node_enable_werror
Node: re-enable -Werror, clean up binding.gyp
2017-07-11 16:17:43 -07:00
Nicolas "Pixel" Noble 4c3360c3fb Adding platform and abi tags in our node-pre-gyp.
Allows to use more than one runtime. Should fix #8887 and #10558.
2017-07-12 00:47:10 +02:00
Muxi Yan c0d3babbaa Update BoringSSL version 2017-07-10 15:25:52 -07:00
Mehrdad Afshari bb3d95b643 Use https://grpc.io consistently as the canonical URL 2017-07-10 22:24:28 +00:00
Muxi Yan 367c2c0eab Update protoc version 2017-07-10 11:21:24 -07:00
Muxi Yan 43c4710a80 Fix the nanopb's header include issue 2017-07-06 21:20:42 -07:00
murgatroid99 32de20ca49 Node: re-enable -Werror, clean up binding.gyp 2017-07-06 17:07:31 -07:00
Muxi Yan af724acc82 Merge pull request #11656 from muxi/move-nanopb-to-cocoapods
Use Cocoapods to manage nanopb
2017-07-05 17:57:28 -07:00
Michael Lumish e9089624fe Merge pull request #11627 from murgatroid99/node_consistent_runtime_version
Make various scripts use the same version of Node
2017-07-05 10:26:56 -07:00
Jan Tattermusch 7405347cd8 Merge pull request #11582 from jtattermusch/cmake_various_fixes
cmake: various fixes
2017-07-03 22:49:38 +02:00
Jan Tattermusch 992f07419a Merge pull request #11637 from kskalski/protobuf_cmake2
Make CMake find_package work for preinstalled libprotobuf on Raspbian.
2017-07-03 17:28:10 +02:00
Eric Gribkoff e5de5e5ffa Run Android interops on Firebase 2017-06-30 13:54:55 -07:00
Muxi Yan ad272c9d76 Polish gRPC-Core.podspec 2017-06-29 16:18:43 -07:00
Muxi Yan d89b9e35ee Use Cocoapods to manage nanopb 2017-06-29 14:31:59 -07:00
Kamil Skalski 6ba7d53b63 Make CMake find_package work for preinstalled libprotobuf on Raspbian. 2017-06-28 19:42:26 +01:00
murgatroid99 a6ce1ff1d6 Fix how npm is upgraded, add npm update line for electron 2017-06-27 18:15:38 -07:00
murgatroid99 7ad758cd84 Make various scripts use the same version of Node 2017-06-27 13:54:22 -07:00
Jan Tattermusch f691556db4 dont reuse protobuf cmake install dirs 2017-06-23 16:21:03 +02:00
Jan Tattermusch f3219f459d make some headers public 2017-06-23 16:21:03 +02:00
Jan Tattermusch b70df57c49 build protobuf without zlib 2017-06-23 16:21:03 +02:00
Jan Tattermusch 74c74fb04e workaround zlib cmake issue 2017-06-23 16:21:03 +02:00
kpayson64 9cd18311a0 Merge pull request #11412 from kpayson64/upgrade_boringssl
Upgrade boringssl
2017-06-20 12:09:21 -07:00
Michael Lumish 8399f92fd6 Merge pull request #11516 from murgatroid99/upmerge_1.4.x
Upmerge 1.4.x into Master
2017-06-19 12:47:29 -07:00
Jan Tattermusch 04d299534d Merge pull request #11140 from randomguy3/cmake-install
Fix CMake installation issues
2017-06-19 17:36:55 +02:00
Jan Tattermusch b82bfa4e95 Merge pull request #11469 from jtattermusch/cmake_explicit_protoc
Explicitly use built protoc for CMake build
2017-06-19 12:11:52 +02:00
murgatroid99 d5b0455110 Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x 2017-06-15 17:48:42 -07:00
Ken Payson f8d6fb7a94 Update boringssl 2017-06-15 17:35:58 -07:00
Jan Tattermusch 807693bd89 cmake: add zlib and cares dep 2017-06-13 09:33:22 +02:00
Jan Tattermusch 6fe1d80335 explicitly use built protoc for CMake build 2017-06-13 09:32:14 +02:00
Jan Tattermusch 7e91ebb41d license fixes 2017-06-08 11:22:41 +02:00
Jan Tattermusch 4d5c3102a1 fix remaining license notices 2017-06-08 11:22:41 +02:00
Jan Tattermusch 7897ae9308 auto-fix most of licenses 2017-06-08 11:22:41 +02:00
yongni 2e47c52386 Merge pull request #11349 from yongni/matrix
Created a Java Oracle8 Dockerfile directory and moved build_inter…
2017-06-07 08:35:07 -07:00
Jan Tattermusch 83a50ee39b Merge pull request #11396 from matt-kwong/fix_csharp
Update Mono to Jessie for C# Dockerfiles
2017-06-06 21:40:18 -07:00