Commit Graph

280 Commits

Author SHA1 Message Date
Michael Lumish cd54c60c08 Merge pull request #2291 from jcanizales/skylark-objc-library
Add Bazel macros to depend on an automatically-generated gRPC library
2015-07-06 14:41:41 -07:00
Jorge Canizales 951cd18309 Fix build breakage of moving include/grpc/ into grpc/ 2015-07-02 20:48:50 -07:00
Jorge Canizales 3beb240544 Minor doc fix in BUILD and BUILD.template 2015-07-02 01:30:33 -07:00
Nicolas Noble 1aa4bc0853 Merge pull request #2268 from murgatroid99/makefile_pkg-config_generate
Add .pc file generation to Makefile
2015-07-01 14:40:46 -07:00
murgatroid99 dbc0caf30e Fixed gpr name in .pc file 2015-07-01 12:59:49 -07:00
murgatroid99 c34a3a6e60 Added missing pthread gpr requirement 2015-07-01 10:35:33 -07:00
Craig Tiller d6cc19e6d7 Tweak timeouts for ?SAN 2015-07-01 10:05:00 -07:00
murgatroid99 8faab237e5 Add .pc file generation to Makefile 2015-06-30 17:24:21 -07:00
Nicolas Noble 821516dc32 Merge pull request #2246 from murgatroid99/makefile_pkg-config_dep_check
Added pkg-config checking to Makefile where possible
2015-06-29 18:07:19 -07:00
Jorge Canizales 50f198260e Add Bazel target for ObjC gRPC runtime 2015-06-29 17:05:52 -07:00
murgatroid99 da7a994a4d Fixed some linking problems 2015-06-29 14:57:37 -07:00
murgatroid99 24e2f4ad84 Added pkg-config checking to Makefile where possible 2015-06-29 11:12:01 -07:00
Jorge Canizales bba8076ed4 Fix indents of rx_library blaze target 2015-06-28 10:25:05 -07:00
Jorge Canizales bb54ae8073 Add roots.pem bundle to the Bazel target, and use a better bundle name. 2015-06-28 10:25:05 -07:00
Jorge Canizales 866255ec29 Add BUILD target for GRPCClient 2015-06-28 10:25:05 -07:00
Jorge Canizales 4dc4e3dffb Blaze dependency on //external:libssl_objc 2015-06-26 22:12:02 -07:00
Jorge Canizales 7b1a0ca2dd Switch to grpc secure 2015-06-26 21:49:42 -07:00
Nicolas Noble 3edd91e680 Merge pull request #2214 from ctiller/are-includes-sane
Add a test that headers are properly in build.json
2015-06-25 23:12:48 -07:00
Craig Tiller 224b04f6ef Make this more robust against merges 2015-06-25 07:11:18 -07:00
Craig Tiller fe8592ee99 Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
	tools/doxygen/Doxyfile.c++.internal
2015-06-25 07:00:18 -07:00
Craig Tiller f75fc12e3a Add a test that headers are properly in build.json
Clean up anything that failed
2015-06-25 06:58:00 -07:00
Jorge Canizales 03d26b5fe2 Merge master into bazel-grpc-unsecured to solve conflict 2015-06-24 13:45:59 -07:00
Craig Tiller 9f903dad14 Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts 2015-06-24 08:59:27 -07:00
Michael Lumish d9145d91f5 Merge pull request #2196 from jcanizales/bazel-grx
Add BUILD target for Objective-C's RxLibrary
2015-06-24 08:56:20 -07:00
Michael Lumish 269575ac0e Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes
Have Cocoapods rename includes in the core wrapper
2015-06-24 08:52:52 -07:00
Jorge Canizales 8c1fd042e4 Add libz dependency to grpc_unsecure_objc 2015-06-23 22:43:49 -07:00
Jorge Canizales 140bca8c5c Generate objc_library for grpc_unsecure & gpr 2015-06-23 22:43:49 -07:00
Jorge Canizales 44dc423f99 Add BUILD target for Objective-C's RxLibrary
Part of https://github.com/grpc/grpc/issues/2120
Depends on https://github.com/grpc/grpc/pull/2193
2015-06-23 21:38:24 -07:00
Jorge Canizales 59bb9d7d56 Have Cocoapods rename includes in the core wrapper
Fixes https://github.com/grpc/grpc/issues/2194 .
2015-06-23 21:13:29 -07:00
Jorge Canizales ea9b4fdd27 Move header_mappings_dir one dir up so imports are like <RxLibrary/...>
Part of fixing https://github.com/grpc/grpc/issues/2192
2015-06-23 20:40:12 -07:00
Craig Tiller e2288fcd8d Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts
Conflicts:
	gRPC.podspec
	templates/gRPC.podspec.template
2015-06-23 18:32:26 -07:00
Craig Tiller eb327fba7c Make it less likely a build.json change triggers a merge conflict 2015-06-23 16:51:38 -07:00
murgatroid99 df3557738c Made podspec move include/grpc up a level 2015-06-23 16:39:29 -07:00
murgatroid99 5676cd1b5a Undid removal of podspec header comments 2015-06-22 16:27:56 -07:00
murgatroid99 33863680df Removed redundant include paths from podspec 2015-06-22 16:25:42 -07:00
murgatroid99 c241d2c307 Added info about regenerating files to Makefile and BUILD templates 2015-06-22 11:19:57 -07:00
murgatroid99 c525de8ad7 Added generated file info and copyright notice to podspec template 2015-06-22 11:17:33 -07:00
Craig Tiller 7552f0f958 Ensure tests are built during run_tests runs
The issue remains that we don't test our tools, but at least we test
that they compile.
2015-06-19 17:46:20 -07:00
Craig Tiller 52c6142a30 Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
	gRPC.podspec
	tools/doxygen/Doxyfile.core.internal
2015-06-18 13:24:15 -07:00
murgatroid99 9fb72cd7b5 Re-enabled warnings in the gRPC podspec 2015-06-18 12:52:47 -07:00
Craig Tiller b6b3015a84 Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
	include/grpc/compression.h
2015-06-17 17:27:50 -07:00
Jan Tattermusch c9c83cf6ad setting CPPFLAGS breaks openssl build 2015-06-17 13:42:34 -07:00
Craig Tiller e7621eedd6 Merge branch 'you-complete-me' into we-dont-need-no-backup 2015-06-17 10:44:53 -07:00
murgatroid99 f398d5c9d3 Fixed file renaming in podspec template 2015-06-16 14:07:36 -07:00
Nicolas "Pixel" Noble 52a2322135 Explicitely selecting gpr and grpc instead of trying our best. 2015-06-15 22:48:06 +02:00
Nicolas "Pixel" Noble b4f35c0344 Transforming gRPC.podspec to use build.json instead of globbing. 2015-06-15 22:32:00 +02:00
Craig Tiller f50abfcbc2 Merge github.com:grpc/grpc into we-dont-need-no-backup 2015-06-05 15:26:35 -07:00
Craig Tiller 78a97ed3f9 Get internal documentation generated in the right place 2015-06-05 10:03:53 -07:00
Craig Tiller 8cc6f42287 Merge github.com:grpc/grpc into we-dont-need-no-backup 2015-06-02 16:28:36 -07:00
Masood Malekghassemi a6de798209 Merge pull request #1859 from nicolasnoble/no-pollution-from-global-grpc
Avoid polluting our compilation with previously installed grpc.
2015-06-02 16:03:57 -07:00