summaryrefslogtreecommitdiff
path: root/init-tools.cmd
diff options
context:
space:
mode:
authorJacek Blaszczynski <biosciencenow@outlook.com>2017-10-24 00:04:05 (GMT)
committerJacek Blaszczynski <biosciencenow@outlook.com>2017-10-24 00:04:05 (GMT)
commit811761c22da85b7bbc6861756ee20be906a04057 (patch)
tree78a79440e0abaa7c3eb5a3b7f81561a5ce4caa11 /init-tools.cmd
parent83a3a7ddf9a399d1c065a6480b1c95d218a175dc (diff)
downloadcoreclr-811761c22da85b7bbc6861756ee20be906a04057.zip
coreclr-811761c22da85b7bbc6861756ee20be906a04057.tar.gz
coreclr-811761c22da85b7bbc6861756ee20be906a04057.tar.bz2
Cleanup VsDevCmd.bat usage and improve build system messages to ease diagnostics
Diffstat (limited to 'init-tools.cmd')
-rw-r--r--init-tools.cmd16
1 files changed, 8 insertions, 8 deletions
diff --git a/init-tools.cmd b/init-tools.cmd
index 235f645..4793df0 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 Tools are already initialized.
+ echo %__MsgPrefix%Tools are already initialized.
goto :EOF
)
@@ -38,7 +38,7 @@ echo Running %0 > "%INIT_TOOLS_LOG%"
set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
if exist "%DOTNET_CMD%" goto :afterdotnetrestore
-echo Installing dotnet cli...
+echo %__MsgPrefix%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.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
@@ -53,8 +53,8 @@ if NOT exist "%DOTNET_LOCAL_PATH%" (
:afterdotnetrestore
if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
-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%"
+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%"
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" (
echo ERROR: Could not restore build tools correctly. 1>&2
@@ -63,8 +63,8 @@ if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
:afterbuildtoolsrestore
-echo Initializing BuildTools...
-echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
+echo %__MsgPrefix%Initializing BuildTools...
+echo %__MsgPrefix%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] (
@@ -73,11 +73,11 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
)
:: Create semaphore file
-echo Done initializing tools.
+echo %__MsgPrefix%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%"
+echo %__MsgPrefix%Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
exit /b 0
:error