Commit Graph

320 Commits

Author SHA1 Message Date
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -07:00
MakMukhi c090c619c1 Merge pull request #10644 from MakMukhi/master
Added unit testing support.
2017-04-24 16:36:40 -07:00
Mahak Mukhi 1bcb976a3a Tab/space problem with Makefile.template 2017-04-18 17:58:16 -07:00
Mahak Mukhi af3d2bc997 Readding the line mistakenly deleted. 2017-04-18 17:21:43 -07:00
Mahak Mukhi fb059a2782 discovered generate_projects.sh script! 2017-04-18 14:40:00 -07:00
murgatroid99 a41fd5b086 Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 2017-04-13 09:56:17 -07:00
Ken Payson 975b5103e5 Fix build on Alpine linux + add portability tests 2017-04-06 13:39:35 -07:00
Nicolas Noble 6ee38a7e51 Merge pull request #9780 from ctiller/cpp_bazelness
More C++ Bazel support
2017-03-30 10:21:11 -07:00
Nicolas "Pixel" Noble b0367ca244 Fixing embedded build of cares for certain targets. 2017-03-29 21:53:38 +02:00
Nicolas "Pixel" Noble 8e0684b5d4 Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness 2017-03-27 18:50:04 +02:00
murgatroid99 d166e38e93 Fix soname version mismatch in Makefile 2017-03-24 10:12:51 -07:00
Yuchen Zeng 2c977084c8 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-03-17 15:57:23 -07:00
Craig Tiller bf515b6f7f Merge github.com:grpc/grpc into cpp_bazelness 2017-02-24 16:23:50 -08:00
Craig Tiller 19f3ea2c20 Start bringing microbenchmarks to Bazel 2017-02-17 15:17:05 -08:00
Nicolas "Pixel" Noble e00d63f3ea Merge remote-tracking branch 'google/v1.1.x' 2017-02-13 23:37:17 +01:00
Yuchen Zeng 86d2115553 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-02-01 16:12:08 -08:00
Nicolas "Pixel" Noble 8087d70c4e Ruby windows fix - LDLIBS always belongs last, for link order reasons. 2017-02-01 02:23:50 +01:00
Robbie Shade ca7effcdff Replace timeout/scaling macros with functions. 2017-01-31 15:40:20 -05:00
Yuchen Zeng 6694bb079a Migrate to the new c-ares dir 2017-01-23 17:09:51 -08:00
Yuchen Zeng 04ec4701e3 Merge remote-tracking branch 'upstream/master' into cares_buildin 2017-01-18 18:49:07 -08:00
Mario Emmenlauer 44b2d08149 Makefile.template: use import library names for mingw, instead of static libraries 2017-01-13 12:35:49 +01:00
Mario Emmenlauer 06d3d4ad38 Makefile.template: remove the 'imp' suffix from MINGW library names 2017-01-13 12:22:24 +01:00
Mario Emmenlauer 8e883b23ba Makefile.template: fixed a few variables names, and added a missing variable on dll name 2017-01-12 11:45:52 +01:00
Mario Emmenlauer 13f6716d85 Makefile.template and Makefile: install plugins on MSYS2 / MINGW32 platform 2017-01-11 08:43:11 +01:00
Mario Emmenlauer 1643c045a0 Makefile.template and Makefile: avoid stripping too heavily on MSYS2 / MINGW32 platform 2017-01-11 08:41:00 +01:00
Mario Emmenlauer 121d289e28 Makefile.template and Makefile: use .exe suffix for grpc_cpp_plugin on MSYS2 / MINGW32 platform 2017-01-11 08:40:21 +01:00
Mario Emmenlauer 294dc2f003 Makefile.template and Makefile: avoid def-files on MSYS2 / MINGW32 platform 2017-01-11 08:38:53 +01:00
Yuchen Zeng bd363544fd Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-11-08 10:56:16 -08:00
Craig Tiller d7b1bdf8f4 Fix dependency glitch 2016-11-04 16:20:13 -07:00
Craig Tiller 194b23856a Merge github.com:grpc/grpc into decouple_version_number 2016-11-04 16:01:23 -07:00
Yuchen Zeng c76e9d3062 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-28 15:41:58 -07:00
murgatroid99 c36f6ea745 Compile and link core tests with libuv 2016-10-03 09:24:09 -07:00
Craig Tiller 40c8fba13c Start handling things in Makefile.template 2016-09-15 16:29:09 -07:00
Craig Tiller 27f7084fe4 Start handling things in Makefile.template 2016-09-15 16:21:54 -07:00
Craig Tiller 38b99e9b8c Start handling things in Makefile.template 2016-09-15 16:18:09 -07:00
Yuchen Zeng 78cc066db2 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-08-24 18:22:24 -07:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Yuchen Zeng df2a7b7e40 Fix build with system c-ares 2016-08-18 14:57:03 -07:00
Yuchen Zeng 7c8be1dd55 Fix missing header 2016-08-17 20:36:05 -07:00
Yuchen Zeng 15141a630d Merge c-ares into libgrpc.a 2016-08-17 18:56:04 -07:00
Yuchen Zeng d4df55e115 Update required protobuf version to v3.0.0 2016-08-15 17:50:12 -07:00
Nicolas "Pixel" Noble e1ee20bde6 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-08-16 01:54:33 +02:00
Yuchen Zeng 7ef54b662f Fix sed failure on mac 2016-08-15 13:46:59 -07:00
Yuchen Zeng 979937315f Try to fix clang3.6+ build 2016-08-12 14:17:48 -07:00
Yuchen Zeng f914c1d970 Add walkaround for github.com/c-ares/c-ares/issues/44 2016-08-12 13:49:33 -07:00
Yuchen Zeng b1b2115a26 Fix ruby build 2016-08-12 11:27:30 -07:00
Yuchen Zeng f64bf28e87 Build c-ares without running ./configure 2016-08-11 21:21:59 -07:00
Yuchen Zeng 839fff5df0 Try to solve csharp build issue on mac 2016-08-11 01:07:46 -07:00
Yuchen Zeng d56124cb66 Fix csharp on mac os 2016-08-10 21:23:09 -07:00
murgatroid99 a3c5535c64 Remove use of verify-install target in Makefile 2016-08-10 13:41:31 -07:00