aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
Commit message (Collapse)AuthorAge
* Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfileGravatar kpayson642016-07-25
|\ | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile
* \ Merge pull request #7518 from nicolasnoble/plugins-should-compileGravatar Nicolas Noble2016-07-25
|\ \ | | | | | | We should always try to compile the protoc plugins when building tests.
| | * fix copyrightGravatar Stanley Cheung2016-07-25
| | |
| * | We should always try to compile the protoc plugins when building tests.Gravatar Nicolas "Pixel" Noble2016-07-25
| | |
| | * php: add php7 to jenkins basic and interop testsGravatar Stanley Cheung2016-07-23
| | |
| | * php: remove protobuf-php clone hackGravatar Stanley Cheung2016-07-22
| | |
| | * remove outdated php dockerfile dependencyGravatar Stanley Cheung2016-07-22
| |/
* | Merge v1.0.x into masterGravatar murgatroid992016-07-22
|\ \ | |/ |/|
* | php: update composer.jsonGravatar Stanley Cheung2016-07-21
| |
* | php: update package.xml to 1.0.0RC2Gravatar Stanley Cheung2016-07-21
| |
| * php: update composer.jsonGravatar Stanley Cheung2016-07-21
| |
| * php: update package.xml to 1.0.0RC2Gravatar Stanley Cheung2016-07-21
| |
* | Merge pull request #7476 from vjpai/enable_crossGravatar Nicolas Noble2016-07-21
|\ \ | | | | | | Makefile modifications and instructions to enable cross-compilation
| * | Makefile modifications and instructions to enable cross-compilationGravatar Vijay Pai2016-07-19
| | |
| | * Merge pull request #7374 from kpayson64/python_health_check_renameGravatar kpayson642016-07-19
| | |\ | | | | | | | | Polish grpcio_health_checking package
| | * \ Merge pull request #7413 from jcanizales/p0-advance-versions-to-1Gravatar makdharma2016-07-18
| | |\ \ | | | | | | | | | | Advance versions from 0.14 -> 1.0.0-pre1
| | | * | Commit as 1.0.0-pre1 so we can release already.Gravatar Jorge Canizales2016-07-18
| | | | |
| | | | * Polish grpcio_health_checking packageGravatar Ken Payson2016-07-18
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | -Rename namespace to grpc_health->grpc to match spec -Proper use of NOT_FOUND status code -Improve testing -Add source distribution to artifact build
| | | * We’re done with the underscore tags for good!Gravatar Jorge Canizales2016-07-18
| | | | | | | | | | | | Yay compatibility and predictability!
| | | * Write 100 times: “gRPC-Core.podspec is a template”Gravatar Jorge Canizales2016-07-18
| | | |
| | * | Overhaul how the native extension is found, loaded and usedGravatar Jon Skeet2016-07-15
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal of this is to fix #7230. The changes here are: - The layout in the nuget package; the files are now in `/runtimes/{os}/native/{library}` - The filename of each library, which now includes the architecture, e.g `grpc_csharp_ext.x64.dll` - The targets file used to copy those files in msbuild-based projects; note that we now don't build up a folder structure. - The way the functions are found Before this change, on Linux and OSX we used to find library symbols manually, and use DllImport on Windows. With this change, the name of the library file changes based on architecture, so `DllImport` doesn't work. Instead, we have to use `GetProcAddress` to fetch the function. This is further convoluted by the convention on Windows-x86 to prefix the function name with `_` and suffix it based on the stack size of the arguments. We can't easily tell the argument size here, so we just try 0, 4, 8...128. (128 bytes should be enough for anyone.) This is inefficient, but it's a one-time hit with a known number of functions, and doesn't seem to have any significant impact. The benefit of this in code is we don't need the DllImports any more, and we don't need to conditionally use `FindSymbol` - we just use it for everything, so things are rather more uniform and tidy. The further benefit of this is that the library name is no longer tied to a particular filename format - so if someone wanted to have a directory with the libraries for every version in, with the version in the filename, we'd handle that just fine. (At least once Testing: - Windows: - Console app under msbuild, dotnet cli and DNX - ASP.NET Classic under msbuild - ASP.NET Core (still running under net451) - Ubuntu 16.04 - Console app under dotnet cli, run with dotnet run and mono - OSX: - Console app under dotnet cli, run with dotnet run and mono Under dotnet cli, a dependency on `Microsoft.NETCore.Platforms` is required in order to force the libraries to be copied. This change does *not* further enable .NET Core. It attempts to keep the existing experimental .NET Core project files in line with the msbuild files, but I expect further work to be required for .NET Core, which has a different build/publication model.
| | * Merge pull request #7384 from soltanmm/import-stallionGravatar kpayson642016-07-14
| | |\ | | | | | | | | Move Python.h include out of loader code
* | | | Merged master branchGravatar Muxi Yan2016-07-14
|\| | |
* | | | Establish Objective C end-to-end core test with CronetGravatar Muxi Yan2016-07-14
| | | |
| * | | php: fix interop tests breakageGravatar Stanley Cheung2016-07-13
| | | |
| | * | php: fix interop tests breakageGravatar Stanley Cheung2016-07-13
| | | |
| * | | Merge pull request #7364 from stanley-cheung/php-prepare-for-gaGravatar Stanley Cheung2016-07-13
| |\ \ \ | | | | | | | | | | php: prepare for GA release
| | | | * Remove Python 'loader' hackGravatar Masood Malekghassemi2016-07-13
| | | |/
| * | | Merge pull request #7265 from thunderboltsid/issue-7094-retryGravatar Nicolas Noble2016-07-13
| |\ \ \ | | | | | | | | | | Retrying: Make the testing scripts executable on Python 3.x
| * \ \ \ Merge pull request #7112 from thunderboltsid/issue-7110Gravatar Nicolas Noble2016-07-13
| |\ \ \ \ | | | | | | | | | | | | Add dockerfile for pyenv and modify run_tests.py to include py35 and py36
| | | | * | php: prepare for GA releaseGravatar Stanley Cheung2016-07-13
| | | | | |
| | | | | * php: prepare for GA releaseGravatar Stanley Cheung2016-07-13
| | |_|_|/ | |/| | |
| * | | | Merge branch 'release-0_15' into v1.0.xGravatar Nicolas "Pixel" Noble2016-07-13
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules gRPC.podspec
| | * | | gRPC.podspec shouldn't be a template anymore.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | |
| * | | | Merge branch 'release-0_15' into upmerge-masterGravatar Nicolas "Pixel" Noble2016-07-12
|/| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml gRPC-Core.podspec gRPC.podspec package.json package.xml src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/tools/package.json src/python/grpcio/grpc/__init__.py src/python/grpcio/grpc_version.py src/python/grpcio_tests/tests/unit/_rpc_test.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb templates/gRPC.podspec.template tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal tools/run_tests/port_server.py
| * | | Merge branch 'release-0_14' into release-0_15Gravatar Nicolas "Pixel" Noble2016-07-12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec src/objective-c/BoringSSL.podspec src/objective-c/examples/RemoteTestClient/RemoteTest.podspec src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj src/objective-c/tests/Podfile templates/gRPC.podspec.template third_party/protobuf
| | | | * Make testing toolchain python 3.x compliantGravatar siddharthshukla2016-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | six is necessary for making these scripts cross compatible between python 2.x and 3.x Changes: Add six to python_deps.include Include python_deps.include to all Dockerfile templates in test directory Include python_deps.include to all Dockerfile templates in stress_test directory Include python_deps.include to all Dockerfile templates in interop_test directory Replace print statements with print function calls (from futute..) Replace .iteritems() with .items() wherever necessary use six.moves to import BaseHTTPServer Generate new dockerfiles using generate_projects.sh
| | | * | Enable py35 and py36 testingGravatar siddharthshukla2016-07-11
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dockerfile template for python_pyenv_x64 docker image Generate the dockerfile using generate_projects.sh Modify run_tests.py to include python3.5 and python3.6 Runs python_jessie_x64 for python versions 2.7 and 3.4, and python_pyenv_x64 for python versions 3.5 and 3.6
* | | / Updated composer.json.templateGravatar Ken Payson2016-07-11
| |_|/ |/| |
* | | Merge pull request #7235 from tberghammer/cmake-protobufGravatar Nicolas Noble2016-07-11
|\ \ \ | | | | | | | | Remove gmock protobuf dependency from cmake build
* \ \ \ Merge pull request #7195 from soltanmm/winfixGravatar kpayson642016-07-08
|\ \ \ \ | | | | | | | | | | Fix Python interop unit-tests on Windows
* \ \ \ \ Merge pull request #7203 from murgatroid99/node_separate_health_checkGravatar Nicolas Noble2016-07-08
|\ \ \ \ \ | | | | | | | | | | | | Split Node health check code into a separate package and make it use static codegen
| | * | | | Make Python build standalone on WindowsGravatar Masood Malekghassemi2016-07-08
| |/ / / / |/| | | |
* | | | | Merge pull request #7219 from jcanizales/merge-0.14-into-masterGravatar makdharma2016-07-08
|\ \ \ \ \ | | | | | | | | | | | | Merge 0.14 into master
* \ \ \ \ \ Merge pull request #6791 from soltanmm/painGravatar kpayson642016-07-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make running individual Python tests less painful
| | | | * | | Remove gmock protobuf dependency from cmake buildGravatar Tamas Berghammer2016-07-06
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A full build of protobuf depends on gmock even though it is not part of a standrad checkout. This CL explicitly disable the build of the protobuf tests to get rid of this dependency. If somebody want to build the protobuf tests then they have to download gmock to the protobuf directory and specify -Dprotobuf_BUILD_TESTS=ON to the cmake command line. Fixes https://github.com/grpc/grpc/issues/7233
* | | | | | Merge pull request #7210 from ctiller/no-more-zookeeperGravatar Nicolas Noble2016-07-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expunge all references to zookeeper
| | | * \ \ \ Merge master into merge-0.14-into-masterGravatar Jorge Canizales2016-07-01
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | The protobuf commit conflicted. Resolved to the latest one.
* | | | | | | Regenerating project files, and adding experimental disclaimer.Gravatar Nicolas "Pixel" Noble2016-07-02
| | | | | | |
* | | | | | | Merge remote-tracking branch 'google/master' into contrib-cmakeGravatar Nicolas "Pixel" Noble2016-07-02
|\ \ \ \ \ \ \