Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into makefile-cleanup | Nicolas "Pixel" Noble | 2016-01-28 |
|\ | | | | | | | | | | | Conflicts: Makefile templates/Makefile.template | ||
* | | CFLAGS and CXXFLAGS should be specializations of CPPFLAGS, not the over way ↵ | Nicolas "Pixel" Noble | 2016-01-28 |
| | | | | | | | | around. | ||
* | | Moving some config defaults to build.yaml, and moving others to CPPFLAGS. | Nicolas "Pixel" Noble | 2016-01-28 |
| | | |||
* | | Removing Makefile circular dependencies. | Nicolas "Pixel" Noble | 2016-01-27 |
| | | |||
| * | Merge github.com:grpc/grpc into mwah | Craig Tiller | 2016-01-27 |
| |\ | |/ |/| | |||
* | | Merge pull request #4901 from nicolasnoble/makefile-cleanup | Craig Tiller | 2016-01-26 |
|\ \ | | | | | | | Cleaning up our Makefile. | ||
| * | | Finally fixing the issue with CC, CX, LD, and AR not being overridable from ↵ | Nicolas "Pixel" Noble | 2016-01-27 |
| | | | | | | | | | | | | the environment. | ||
* | | | Merge branch 'master' into node_binary_precompile | murgatroid99 | 2016-01-26 |
|\ \ \ | |||
| * \ \ | Merge pull request #4877 from murgatroid99/node_library_bundle | Nicolas Noble | 2016-01-26 |
| |\ \ \ | | | | | | | | | | | Make Node library depend on BoringSSL and zlib, and only build them under Windows | ||
| | | * | | Cleaning up our Makefile. | Nicolas "Pixel" Noble | 2016-01-26 |
| | |/ / | |/| | | | | | | | | | | | | | | -) Adding question marks to important tools so they can be overriden from environment variables. -) Removing all traces of -ldl since BoringSSL doesn't implement OpenSSL's DSO and doesn't require it. | ||
| | | * | Merge branch 'fixes' into mwah | Craig Tiller | 2016-01-26 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Fix sanity | Craig Tiller | 2016-01-26 |
| | | | | |||
| | | * | Merge branch 'mwah' of github.com:ctiller/grpc into mwah | Craig Tiller | 2016-01-25 |
| | | |\ | |||
| | | * \ | Merge github.com:grpc/grpc into mwah | Craig Tiller | 2016-01-25 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Make Node library depend on BoringSSL and zlib, and only build them under ↵ | murgatroid99 | 2016-01-25 |
| | | | | | | | | | | | | | | | | | | | | Windows | ||
| | | | * | Fix compiler flags | Craig Tiller | 2016-01-25 |
| | | |/ | |||
| | | * | Fix *SAN compilation | Craig Tiller | 2016-01-25 |
| | | | | |||
| | | * | Fix a build error on newer clangs with msan | Craig Tiller | 2016-01-25 |
| | |/ | |||
| * / | get C# version generated by templates | Jan Tattermusch | 2016-01-22 |
| |/ | |||
| * | Merge pull request #4812 from ctiller/integrate-zlib | Jan Tattermusch | 2016-01-22 |
| |\ | | | | | | | Make zlib a first class build citizen | ||
| * \ | Merge pull request #4791 from ctiller/rtt2 | Michael Lumish | 2016-01-21 |
| |\ \ | | | | | | | | | Move build configs into build.yaml | ||
| | | * | Fix sanity | Craig Tiller | 2016-01-21 |
| | | | | |||
| * | | | Add -std=gnu99 when building libgrpc | Rob Earhart | 2016-01-21 |
| | | | | |||
| | | * | Clean up Windows | Craig Tiller | 2016-01-21 |
| | | | | |||
| | | * | Make zlib a first class build citizen | Craig Tiller | 2016-01-21 |
| | |/ | |/| | |||
| | * | Fix C++ | Craig Tiller | 2016-01-20 |
| | | | |||
| | * | Move build configs into build.yaml | Craig Tiller | 2016-01-20 |
| |/ | | | | | | | | | | | | | | | | | | | Importantly: - allows matching timeout values between makefile and run_tests without repeating ourselves - allows borrowing of compiler flags by other build systems There's still a little too much build configuration built into our Makefile, but we can start attacking that over time. | ||
* | | Update copyright in binding.gyp | murgatroid99 | 2016-01-20 |
| | | |||
* | | Make sure that the binary URL includes the word Node | murgatroid99 | 2016-01-20 |
| | | |||
* | | Completed integration of node-pre-gyp into Node library | murgatroid99 | 2016-01-20 |
| | | |||
| * | Use CPU cost modelling to increase parallelism | Craig Tiller | 2016-01-20 |
| | | |||
* | | Added node-pre-gyp stuff to package.json | murgatroid99 | 2016-01-15 |
| | | |||
| * | Fix TSAN on Jenkins and on my machine | Craig Tiller | 2016-01-15 |
| | | |||
| * | Merge pull request #4739 from ctiller/fix-the-fscking-tsan-build | Nicolas Noble | 2016-01-15 |
|/| | | | | | Hard code text segment address for msan, tsan | ||
* | | Merge pull request #4688 from jtattermusch/static_deps | Nicolas Noble | 2016-01-15 |
|\ \ | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
* | | | public_headers not found in some cases when running the import | Sree Kuchibhotla | 2016-01-14 |
| | | | |||
| | * | Hard code text segment address for msan, tsan | Craig Tiller | 2016-01-15 |
| | | | | | | | | | | | | Somehow these are getting loaded at bad addresses by whatever kernels we have on our Jenkins slaves. Fix the load address to something safe to avoid this. | ||
* | | | Merge branch 'master' into release-0_12_master_merge | murgatroid99 | 2016-01-13 |
|\ \ \ | | |/ | |/| | |||
| | * | support static linkage for dependencies | Jan Tattermusch | 2016-01-12 |
| | | | |||
| * | | Updated copyrights | murgatroid99 | 2016-01-12 |
| | | | |||
| * | | Merge pull request #4457 from soltanmm/plate-tectonics | Nathaniel Manista | 2016-01-12 |
| |\ \ | | |/ | |/| | Include core in Python distribution. | ||
| * | | Merge pull request #4238 from ctiller/poffy | Vijay Pai | 2016-01-11 |
| |\ \ | | | | | | | | | Make pick_first fast path lock free | ||
| * \ \ | Merge pull request #4525 from ctiller/proto_names | Vijay Pai | 2016-01-11 |
| |\ \ \ | | | | | | | | | | | Consolidate C++ proto files under src/proto | ||
* | | | | | Merged from master and resolved merge conflicts | murgatroid99 | 2016-01-08 |
|\| | | | | |||
| * | | | | Removed redundant std= cflag | murgatroid99 | 2016-01-07 |
| | | | | | |||
| * | | | | Compile Node extension with c99 and c++11 | murgatroid99 | 2016-01-07 |
| | | | | | |||
* | | | | | Merge pull request #4634 from murgatroid99/ruby_metadata_downcasing | Craig Tiller | 2016-01-07 |
|\ \ \ \ \ | | | | | | | | | | | | | Make the Ruby extension throw an error when passed invalid metadata | ||
| | | * \ \ | Merge github.com:grpc/grpc into proto_names | Craig Tiller | 2016-01-07 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge pull request #4616 from ctiller/i-like-pie | Michael Lumish | 2016-01-07 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Tweak compiler settings to hopefully make Jenkins more robust | ||
* | | | | | | | Slightly loosen dependencies | murgatroid99 | 2016-01-07 |
| | | | | | | |