diff options
author | Craig Tiller <ctiller@google.com> | 2017-05-16 13:42:07 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-05-16 13:42:07 -0700 |
commit | 321b7d8fb0dbe40f27685f733a3098bd4fd9c77b (patch) | |
tree | 3386f15aa6d894f972048bd08ab25e0cce489441 /templates/src/csharp/build_packages_dotnetcli.sh.template | |
parent | 8996208bc3af635160964a784ea643e28c6bd9e0 (diff) | |
parent | bcb65f0bd533ff0c7babf3b06a424d2bd5f1d37d (diff) |
Merge github.com:grpc/grpc into thread_pool
Diffstat (limited to 'templates/src/csharp/build_packages_dotnetcli.sh.template')
-rwxr-xr-x | templates/src/csharp/build_packages_dotnetcli.sh.template | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/templates/src/csharp/build_packages_dotnetcli.sh.template b/templates/src/csharp/build_packages_dotnetcli.sh.template index 374b236f93..65afec55c4 100755 --- a/templates/src/csharp/build_packages_dotnetcli.sh.template +++ b/templates/src/csharp/build_packages_dotnetcli.sh.template @@ -36,35 +36,19 @@ mkdir -p ../../artifacts/ - mkdir -p nativelibs/windows_x86 nativelibs/windows_x64 ${"\\"} - nativelibs/linux_x86 nativelibs/linux_x64 ${"\\"} - nativelibs/macosx_x86 nativelibs/macosx_x64 - - mkdir -p protoc_plugins/windows_x86 protoc_plugins/windows_x64 ${"\\"} - protoc_plugins/linux_x86 protoc_plugins/linux_x64 ${"\\"} - protoc_plugins/macosx_x86 protoc_plugins/macosx_x64 - - # Collect the artifacts built by the previous build step if running on Jenkins - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=csharp,platform=windows/artifacts/* nativelibs/windows_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=csharp,platform=windows/artifacts/* nativelibs/windows_x64 || true - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=csharp,platform=linux/artifacts/* nativelibs/linux_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=csharp,platform=linux/artifacts/* nativelibs/linux_x64 || true - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=csharp,platform=macos/artifacts/* nativelibs/macosx_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=csharp,platform=macos/artifacts/* nativelibs/macosx_x64 || true + # Collect the artifacts built by the previous build step + mkdir -p nativelibs + cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/csharp_ext_* nativelibs || true # Collect protoc artifacts built by the previous build step - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=protoc,platform=windows/artifacts/* protoc_plugins/windows_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=protoc,platform=windows/artifacts/* protoc_plugins/windows_x64 || true - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=protoc,platform=linux/artifacts/* protoc_plugins/linux_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=protoc,platform=linux/artifacts/* protoc_plugins/linux_x64 || true - cp $EXTERNAL_GIT_ROOT/architecture=x86,language=protoc,platform=macos/artifacts/* protoc_plugins/macosx_x86 || true - cp $EXTERNAL_GIT_ROOT/architecture=x64,language=protoc,platform=macos/artifacts/* protoc_plugins/macosx_x64 || true + mkdir -p protoc_plugins + cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/protoc_* protoc_plugins || true dotnet restore Grpc.sln # To be able to build, we also need to put grpc_csharp_ext to its normal location mkdir -p ../../libs/opt - cp nativelibs/linux_x64/libgrpc_csharp_ext.so ../../libs/opt + cp nativelibs/csharp_ext_linux_x64/libgrpc_csharp_ext.so ../../libs/opt dotnet pack --configuration Release Grpc.Core --output ../../../artifacts dotnet pack --configuration Release Grpc.Core.Testing --output ../../../artifacts |