diff options
-rw-r--r-- | init-tools.cmd | 31 | ||||
-rwxr-xr-x | init-tools.sh | 85 |
2 files changed, 58 insertions, 58 deletions
diff --git a/init-tools.cmd b/init-tools.cmd index a5750290c4..ec21fe808d 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -21,7 +21,7 @@ if [%1]==[force] ( :: If semaphore exists do nothing if exist "%BUILD_TOOLS_SEMAPHORE%" ( - echo %__MsgPrefix%Tools are already initialized. + echo Tools are already initialized. goto :EOF ) @@ -37,6 +37,7 @@ if exist "%DotNetBuildToolsDir%" ( ) echo Done initializing tools. + if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" echo Using tools from '%DotNetBuildToolsDir%'. > "%BUILD_TOOLS_SEMAPHORE%" exit /b 0 ) @@ -46,26 +47,26 @@ echo Running %0 > "%INIT_TOOLS_LOG%" set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" if exist "%DOTNET_CMD%" goto :afterdotnetrestore -echo %__MsgPrefix%Installing dotnet cli... +echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% -echo %__MsgPrefix%Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" -powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" +echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" +powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; $proxyCredentialsRequired = $false; do { try { $wc = New-Object Net.WebClient; if ($proxyCredentialsRequired) { [Net.WebRequest]::DefaultWebProxy.Credentials = [Net.CredentialCache]::DefaultNetworkCredentials; } $wc.DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $we = $_.Exception.InnerException -as [Net.WebException]; $proxyCredentialsRequired = ($we -ne $null -and ([Net.HttpWebResponse]$we.Response).StatusCode -eq [Net.HttpStatusCode]::ProxyAuthenticationRequired); Start-Sleep -Seconds (5 * $retryCount); $retryCount++; } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" if NOT exist "%DOTNET_LOCAL_PATH%" ( - echo %__MsgPrefix%ERROR: Could not install dotnet cli correctly. 1>&2 + echo ERROR: Could not install dotnet cli correctly. 1>&2 goto :error ) :afterdotnetrestore if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore -echo %__MsgPrefix%Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo %__MsgPrefix%Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" +echo Restoring BuildTools version %BUILDTOOLS_VERSION%... +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( - %__MsgPrefix%echo ERROR: Could not restore build tools correctly. 1>&2 + echo ERROR: Could not restore build tools correctly. 1>&2 goto :error ) @@ -74,8 +75,8 @@ if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( :: Ask init-tools to also restore ILAsm set /p ILASMCOMPILER_VERSION=< "%~dp0ILAsmVersion.txt" -echo %__MsgPrefix%Initializing BuildTools... -echo %__MsgPrefix%Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" +echo Initializing BuildTools... +echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL% if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( @@ -84,14 +85,12 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( ) :: Create semaphore file -echo %__MsgPrefix%Done initializing tools. -if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" ( - mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" -) -echo %__MsgPrefix%Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" +echo Done initializing tools. +if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" +echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" exit /b 0 :error -echo %__MsgPrefix%Please check the detailed log that follows. 1>&2 +echo Please check the detailed log that follows. 1>&2 type "%INIT_TOOLS_LOG%" 1>&2 exit /b 1 diff --git a/init-tools.sh b/init-tools.sh index 7f39d555d9..2642a896f6 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash __scriptpath=$(cd "$(dirname "$0")"; pwd -P) -__init_tools_log=$__scriptpath/init-tools.log -__PACKAGES_DIR=$__scriptpath/packages -__TOOLRUNTIME_DIR=$__scriptpath/Tools -__DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli -__DOTNET_CMD=$__DOTNET_PATH/dotnet -if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +__init_tools_log="$__scriptpath/init-tools.log" +__PACKAGES_DIR="$__scriptpath/packages" +__TOOLRUNTIME_DIR="$__scriptpath/Tools" +__DOTNET_PATH="$__TOOLRUNTIME_DIR/dotnetcli" +__DOTNET_CMD="$__DOTNET_PATH/dotnet" +if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi export __BUILDTOOLS_USE_CSPROJ=true -__BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) -__DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) -__ILASM_VERSION=$(cat $__scriptpath/ILAsmVersion.txt) -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild -__BUILD_TOOLS_SEMAPHORE=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete - -if [ -e $__BUILD_TOOLS_SEMAPHORE ]; then +__BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__ILASM_VERSION=$(cat "$__scriptpath/ILAsmVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive +__BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib" +__INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild" +__BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete" + +if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then echo "Tools are already initialized" return #return instead of exit because this script is inlined in other scripts which we don't want to exit fi -if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi +if [ -e "$__TOOLRUNTIME_DIR" ]; then rm -rf -- "$__TOOLRUNTIME_DIR"; fi -if [ -d "$DotNetBuildToolsDir" ]; then +if [ -d "${DotNetBuildToolsDir:-}" ]; then echo "Using tools from '$DotNetBuildToolsDir'." ln -s "$DotNetBuildToolsDir" "$__TOOLRUNTIME_DIR" @@ -32,11 +32,11 @@ if [ -d "$DotNetBuildToolsDir" ]; then fi echo "Done initializing tools." - mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE + mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" return #return instead of exit because this script is inlined in other scripts which we don't want to exit fi -echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log +echo "Running: $__scriptpath/init-tools.sh" > "$__init_tools_log" display_error_message() { @@ -48,7 +48,7 @@ display_error_message() execute_with_retry() { local count=0 local retries=${retries:-5} - local waitFactor=${waitFactor:-6} + local waitFactor=${waitFactor:-6} until "$@"; do local exit=$? count=$(( $count + 1 )) @@ -56,7 +56,7 @@ execute_with_retry() { local wait=$(( waitFactor ** (( count - 1 )) )) echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." sleep $wait - else + else say_err "Retry $count/$retries exited $exit, no more retries left." return $exit fi @@ -65,8 +65,8 @@ execute_with_retry() { return 0 } -if [ ! -e $__DOTNET_PATH ]; then - if [ -z "$__DOTNET_PKG" ]; then +if [ ! -e "$__DOTNET_PATH" ]; then + if [ -z "${__DOTNET_PKG:-}" ]; then if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then echo "Warning: build not supported on 32 bit Unix" fi @@ -96,12 +96,12 @@ if [ ! -e $__DOTNET_PATH ]; then if [[ $ID == "alpine" ]]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} - __PKG_RID=alpine.$VERSION_ID + __PKG_RID=alpine.$VERSION_ID fi elif [ -e /etc/redhat-release ]; then redhatRelease=$(</etc/redhat-release) if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then - __PKG_RID=rhel.6 + __PKG_RID=rhel.6 fi fi @@ -112,8 +112,9 @@ if [ ! -e $__DOTNET_PATH ]; then OS=Linux __PKG_RID=linux ;; - esac - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH + esac + + __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH fi mkdir -p "$__DOTNET_PATH" @@ -121,7 +122,7 @@ if [ ! -e $__DOTNET_PATH ]; then __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.tar.gz" install_dotnet_cli() { - if [[ "$DotNetBootstrapCliTarPath" = "" ]]; then + if [[ -z "${DotNetBootstrapCliTarPath-}" ]]; then echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" rm -rf -- "$__DOTNET_PATH/*" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. @@ -134,25 +135,25 @@ if [ ! -e $__DOTNET_PATH ]; then echo "Copying '$DotNetBootstrapCliTarPath' to '$__DOTNET_PATH/dotnet.tar'" cp $DotNetBootstrapCliTarPath $__DOTNET_PATH/dotnet.tar fi - cd $__DOTNET_PATH - tar -xf $__DOTNET_PATH/dotnet.tar + cd "$__DOTNET_PATH" + tar -xf "$__DOTNET_PATH/dotnet.tar" } execute_with_retry install_dotnet_cli >> "$__init_tools_log" 2>&1 - cd $__scriptpath + cd "$__scriptpath" fi -if [ ! -e $__BUILD_TOOLS_PATH ]; then +if [ ! -e "$__BUILD_TOOLS_PATH" ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> $__init_tools_log - $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> "$__init_tools_log" + "$__DOTNET_CMD" restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages "$__PACKAGES_DIR" --source "$__BUILDTOOLS_SOURCE" /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir="$__TOOLRUNTIME_DIR" >> "$__init_tools_log" if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly." 1>&2 display_error_message fi fi -if [ -z "$__ILASM_RID" ]; then +if [ -z "${__ILASM_RID-}" ]; then __ILASM_RID=$__PKG_RID-$__PKG_ARCH fi @@ -161,17 +162,17 @@ echo "Using RID $__ILASM_RID for BuildTools native tools" export ILASMCOMPILER_VERSION=$__ILASM_VERSION export NATIVE_TOOLS_RID=$__ILASM_RID -if [ ! "$DotNetBootstrapCliTarPath" = "" ]; then +if [ -n "${DotNetBootstrapCliTarPath-}" ]; then # Assume ilasm is not in nuget yet when bootstrapping... unset ILASMCOMPILER_VERSION fi echo "Initializing BuildTools..." -echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> $__init_tools_log +echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> "$__init_tools_log" # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 -chmod +x $__BUILD_TOOLS_PATH/init-tools.sh -$__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR >> $__init_tools_log +chmod +x "$__BUILD_TOOLS_PATH/init-tools.sh" +"$__BUILD_TOOLS_PATH/init-tools.sh" "$__scriptpath" "$__DOTNET_CMD" "$__TOOLRUNTIME_DIR" "$__PACKAGES_DIR" >> "$__init_tools_log" if [ "$?" != "0" ]; then echo "ERROR: An error occurred when trying to initialize the tools." 1>&2 display_error_message @@ -180,12 +181,12 @@ fi echo "Making all .sh files executable under Tools." # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 -ls $__scriptpath/Tools/*.sh | xargs chmod +x -ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x +ls "$__scriptpath/Tools/"*.sh | xargs chmod +x +ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x -Tools/crossgen.sh $__scriptpath/Tools +"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" -mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE +mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" echo "Done initializing tools." |