From ef7c668cff79fd56dfe122f79460f288c7a30ab1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Foidl?= Date: Tue, 12 Nov 2019 00:57:25 +0100 Subject: [PATCH] HTTP/2 code sharing shell sync-script (dotnet/corefx#42425) Commit migrated from https://github.com/dotnet/corefx/commit/cb5be3e9c76c337cb1752b206a50ffc71947aba1 --- .../src/System/Net/Http/Http2/CopyToAspNetCore.cmd | 4 ++-- .../src/System/Net/Http/Http2/CopyToAspNetCore.sh | 19 +++++++++++++++++++ .../Common/src/System/Net/Http/Http2/CopyToCoreFx.cmd | 2 +- .../Common/src/System/Net/Http/Http2/CopyToCoreFx.sh | 19 +++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.sh create mode 100644 src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.sh diff --git a/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.cmd b/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.cmd index 1df4fb7..1785929 100644 --- a/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.cmd +++ b/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.cmd @@ -4,11 +4,11 @@ SETLOCAL if not [%1] == [] (set remote_repo=%1) else (set remote_repo=%ASPNETCORE_REPO%) IF [%remote_repo%] == [] ( - echo The 'ASPNETCORE_REPO' environment variable or command line paramter is not set, aborting. + echo The 'ASPNETCORE_REPO' environment variable or command line parameter is not set, aborting. exit /b 1 ) echo ASPNETCORE_REPO: %remote_repo% robocopy . %remote_repo%\src\Shared\Http2 /MIR -robocopy .\..\..\..\..\..\tests\Tests\System\Net\Http2\ %remote_repo%\src\Shared\test\Shared.Tests\Http2 /MIR \ No newline at end of file +robocopy .\..\..\..\..\..\tests\Tests\System\Net\Http2\ %remote_repo%\src\Shared\test\Shared.Tests\Http2 /MIR diff --git a/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.sh b/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.sh new file mode 100644 index 0000000..f8d0733 --- /dev/null +++ b/src/libraries/Common/src/System/Net/Http/Http2/CopyToAspNetCore.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +if [[ -n "$1" ]]; then + remote_repo="$1" +else + remote_repo="$ASPNETCORE_REPO" +fi + +if [[ -z "$remote_repo" ]]; then + echo The 'ASPNETCORE_REPO' environment variable or command line parameter is not set, aborting. + exit 1 +fi + +cd "$(dirname "$0")" || exit 1 + +echo "ASPNETCORE_REPO: $remote_repo" + +rsync -av --delete ./ "$remote_repo"/src/Shared/Http2 +rsync -av --delete ./../../../../../tests/Tests/System/Net/Http2/ "$remote_repo"/src/Shared/test/Shared.Tests/Http2 diff --git a/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.cmd b/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.cmd index 5945d65..eb7035b 100644 --- a/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.cmd +++ b/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.cmd @@ -4,7 +4,7 @@ SETLOCAL if not [%1] == [] (set remote_repo=%1) else (set remote_repo=%COREFX_REPO%) IF [%remote_repo%] == [] ( - echo The 'COREFX_REPO' environment variable or command line paramter is not set, aborting. + echo The 'COREFX_REPO' environment variable or command line parameter is not set, aborting. exit /b 1 ) diff --git a/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.sh b/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.sh new file mode 100644 index 0000000..f7573db --- /dev/null +++ b/src/libraries/Common/src/System/Net/Http/Http2/CopyToCoreFx.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +if [[ -n "$1" ]]; then + remote_repo="$1" +else + remote_repo="$COREFX_REPO" +fi + +if [[ -z "$remote_repo" ]]; then + echo The 'COREFX_REPO' environment variable or command line parameter is not set, aborting. + exit 1 +fi + +cd "$(dirname "$0")" || exit 1 + +echo "COREFX_REPO: $remote_repo" + +rsync -av --delete ./ "$remote_repo"/src/Common/src/System/Net/Http/Http2 +rsync -av --delete ./../test/Shared.Tests/Http2/ "$remote_repo"/src/Common/tests/Tests/System/Net/Http2 -- 2.7.4