Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merged changes from master | murgatroid99 | 2015-07-08 |
|\ | |||
| * | Fixed typo in variable name | murgatroid99 | 2015-07-08 |
| | | |||
| * | Added OpenSSL NPN pkg-config check | murgatroid99 | 2015-07-08 |
| | | |||
| * | Merged changes from upstream/master | murgatroid99 | 2015-07-08 |
| |\ | |||
* | | | Don't use pkg-config to look for perftools | murgatroid99 | 2015-07-08 |
| |/ |/| | |||
* | | Merge pull request #2174 from nicolasnoble/makefile-npn-check | jboeuf | 2015-07-07 |
|\ \ | | | | | | | Adding a check to find NPN-capable OpenSSL. | ||
* \ \ | Merge pull request #2291 from jcanizales/skylark-objc-library | Michael Lumish | 2015-07-06 |
|\ \ \ | | | | | | | | | Add Bazel macros to depend on an automatically-generated gRPC library | ||
| | | * | Made pkg-config a variable in the Makefile | murgatroid99 | 2015-07-06 |
| | | | | |||
| | | * | Reversed condition for requiring rt | murgatroid99 | 2015-07-06 |
| | | | | |||
| | | * | Make generated .pc files list themselves as libraries | murgatroid99 | 2015-07-06 |
| |_|/ |/| | | |||
* | | | Fix build breakage of moving include/grpc/ into grpc/ | Jorge Canizales | 2015-07-02 |
| | | | |||
| * | | Minor doc fix in BUILD and BUILD.template | Jorge Canizales | 2015-07-02 |
| | | | |||
* | | | Merge pull request #2268 from murgatroid99/makefile_pkg-config_generate | Nicolas Noble | 2015-07-01 |
|\ \ \ | | | | | | | | | Add .pc file generation to Makefile | ||
| * | | | Fixed gpr name in .pc file | murgatroid99 | 2015-07-01 |
| | | | | |||
| * | | | Added missing pthread gpr requirement | murgatroid99 | 2015-07-01 |
| | | | | |||
* | | | | Tweak timeouts for ?SAN | Craig Tiller | 2015-07-01 |
| |/ / |/| | | |||
| * | | Add .pc file generation to Makefile | murgatroid99 | 2015-06-30 |
|/ / | |||
| * | Merge branch 'master' of github.com:grpc/grpc into makefile-npn-check | Nicolas "Pixel" Noble | 2015-06-30 |
| |\ | |/ |/| | | | | | | | Conflicts: Makefile templates/Makefile.template | ||
* | | Merge pull request #2246 from murgatroid99/makefile_pkg-config_dep_check | Nicolas Noble | 2015-06-29 |
|\ \ | | | | | | | Added pkg-config checking to Makefile where possible | ||
* | | | Add Bazel target for ObjC gRPC runtime | Jorge Canizales | 2015-06-29 |
| | | | |||
| * | | Fixed some linking problems | murgatroid99 | 2015-06-29 |
| | | | |||
| * | | Added pkg-config checking to Makefile where possible | murgatroid99 | 2015-06-29 |
| | | | |||
* | | | Fix indents of rx_library blaze target | Jorge Canizales | 2015-06-28 |
| | | | |||
* | | | Add roots.pem bundle to the Bazel target, and use a better bundle name. | Jorge Canizales | 2015-06-28 |
| | | | |||
* | | | Add BUILD target for GRPCClient | Jorge Canizales | 2015-06-28 |
| | | | |||
* | | | Blaze dependency on //external:libssl_objc | Jorge Canizales | 2015-06-26 |
| | | | |||
* | | | Switch to grpc secure | Jorge Canizales | 2015-06-26 |
|/ / | |||
* | | Merge pull request #2214 from ctiller/are-includes-sane | Nicolas Noble | 2015-06-25 |
|\ \ | | | | | | | Add a test that headers are properly in build.json | ||
| * | | Make this more robust against merges | Craig Tiller | 2015-06-25 |
| | | | |||
| * | | Merge github.com:grpc/grpc into are-includes-sane | Craig Tiller | 2015-06-25 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.c++.internal | ||
| * | | | Add a test that headers are properly in build.json | Craig Tiller | 2015-06-25 |
| | | | | | | | | | | | | | | | | Clean up anything that failed | ||
* | | | | Merge master into bazel-grpc-unsecured to solve conflict | Jorge Canizales | 2015-06-24 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-24 |
| |\ \ \ | |||
| | * \ \ | Merge pull request #2196 from jcanizales/bazel-grx | Michael Lumish | 2015-06-24 |
| | |\ \ \ | | | | | | | | | | | | | Add BUILD target for Objective-C's RxLibrary | ||
| | * \ \ \ | Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes | Michael Lumish | 2015-06-24 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Have Cocoapods rename includes in the core wrapper | ||
* | | | | | | | Add libz dependency to grpc_unsecure_objc | Jorge Canizales | 2015-06-23 |
| | | | | | | | |||
* | | | | | | | Generate objc_library for grpc_unsecure & gpr | Jorge Canizales | 2015-06-23 |
| | | | | | | | |||
| | | | * | | | Add BUILD target for Objective-C's RxLibrary | Jorge Canizales | 2015-06-23 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Part of https://github.com/grpc/grpc/issues/2120 Depends on https://github.com/grpc/grpc/pull/2193 | ||
| | | * | | | Have Cocoapods rename includes in the core wrapper | Jorge Canizales | 2015-06-23 |
| |_|/ / / |/| | | | | | | | | | | | | | | Fixes https://github.com/grpc/grpc/issues/2194 . | ||
| | * | | | Move header_mappings_dir one dir up so imports are like <RxLibrary/...> | Jorge Canizales | 2015-06-23 |
| |/ / / |/| | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| * | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-23 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: gRPC.podspec templates/gRPC.podspec.template | ||
| * | | | Make it less likely a build.json change triggers a merge conflict | Craig Tiller | 2015-06-23 |
| |/ / | |||
| | * | Adding a check to find NPN-capable OpenSSL. | Nicolas "Pixel" Noble | 2015-06-24 |
| |/ | |||
* | | Made podspec move include/grpc up a level | murgatroid99 | 2015-06-23 |
| | | |||
* | | Undid removal of podspec header comments | murgatroid99 | 2015-06-22 |
| | | |||
* | | Removed redundant include paths from podspec | murgatroid99 | 2015-06-22 |
|/ | |||
* | Added info about regenerating files to Makefile and BUILD templates | murgatroid99 | 2015-06-22 |
| | |||
* | Added generated file info and copyright notice to podspec template | murgatroid99 | 2015-06-22 |
| | |||
* | Ensure tests are built during run_tests runs | Craig Tiller | 2015-06-19 |
| | | | | | The issue remains that we don't test our tools, but at least we test that they compile. | ||
* | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-18 |
|\ | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal |