From 01b5299fe80dceee2095c61791e38a213330f78c Mon Sep 17 00:00:00 2001 From: Adeel <3840695+am11@users.noreply.github.com> Date: Sun, 15 Jan 2023 03:44:13 +0200 Subject: [PATCH 1/2] Normalize RepoRoot path to improve logs readability --- eng/native/gen-buildsys.cmd | 10 ++++++---- eng/native/version/copy_version_files.cmd | 8 +++++--- src/coreclr/build-runtime.cmd | 2 ++ src/native/corehost/build.cmd | 5 ++++- src/native/libs/build-native.cmd | 12 ++++++++---- src/tests/build.cmd | 3 ++- src/tests/run.cmd | 2 ++ 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index 30c502fe1d9a2..6f40a7e95609d 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -11,8 +11,10 @@ if %argC% lss 4 GOTO :USAGE if %1=="/?" GOTO :USAGE setlocal enabledelayedexpansion -set basePath=%~dp0 -set __repoRoot=%~dp0..\..\ +set "basePath=%~dp0" +set "__repoRoot=%~dp0..\.." +:: normalize +for %%i in ("%__repoRoot%") do set "__repoRoot=%%~fi" :: remove quotes set "basePath=%basePath:"=%" :: remove trailing slash @@ -53,7 +55,7 @@ if /i "%__Arch%" == "wasm" ( exit /B 1 ) - set EMSDK_PATH=%__repoRoot%\src\mono\wasm\emsdk + set "EMSDK_PATH=%__repoRoot%\src\mono\wasm\emsdk" ) :: replace backslash with forward slash and append last slash set "EMSDK_PATH=!EMSDK_PATH:\=/!" @@ -69,7 +71,7 @@ if /i "%__Arch%" == "wasm" ( exit /B 1 ) - set WASI_SDK_PATH=%__repoRoot%src\mono\wasi\wasi-sdk + set "WASI_SDK_PATH=%__repoRoot%src\mono\wasi\wasi-sdk" ) :: replace backslash with forward slash and append last slash set "WASI_SDK_PATH=!WASI_SDK_PATH:\=/!" diff --git a/eng/native/version/copy_version_files.cmd b/eng/native/version/copy_version_files.cmd index ef5f31e24c3de..5fa9300597fd6 100644 --- a/eng/native/version/copy_version_files.cmd +++ b/eng/native/version/copy_version_files.cmd @@ -1,9 +1,11 @@ @if not defined _echo @echo off setlocal EnableDelayedExpansion EnableExtensions -set __VersionFolder=%~dp0 -set __RepoRoot=%~dp0..\..\.. -set __artifactsObjDir=%__RepoRoot%\artifacts\obj +set "__VersionFolder=%~dp0" +set "__RepoRoot=%~dp0..\..\.." +:: normalize +for %%i in ("%__RepoRoot%") do set "__RepoRoot=%%~fi" +set "__artifactsObjDir=%__RepoRoot%\artifacts\obj" for /r "%__VersionFolder%" %%a in (*.h *.rc) do ( if not exist "%__artifactsObjDir%\%%~nxa" ( diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd index f4d27eacd79fe..9086bcb0f7d5d 100644 --- a/src/coreclr/build-runtime.cmd +++ b/src/coreclr/build-runtime.cmd @@ -32,6 +32,8 @@ set "__ProjectDir=%~dp0" :: remove trailing slash if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%" set "__RepoRootDir=%__ProjectDir%\..\.." +:: normalize +for %%i in ("%__RepoRootDir%") do set "__RepoRootDir=%%~fi" set "__ProjectFilesDir=%__ProjectDir%" set "__RootBinDir=%__RepoRootDir%\artifacts" diff --git a/src/native/corehost/build.cmd b/src/native/corehost/build.cmd index 3313ea53023d4..84ee51dba022d 100644 --- a/src/native/corehost/build.cmd +++ b/src/native/corehost/build.cmd @@ -7,7 +7,10 @@ set "__sourceDir=%~dp0" :: remove trailing slash if %__sourceDir:~-1%==\ set "__ProjectDir=%__sourceDir:~0,-1%" -set __engNativeDir=%__sourceDir%\..\..\..\eng\native +set "__RepoRootDir=%__sourceDir%\..\..\.." +:: normalize +for %%i in ("%__RepoRootDir%") do set "__RepoRootDir=%%~fi" +set "__engNativeDir=%__RepoRootDir%\eng\native" set __CMakeBinDir="" set __IntermediatesDir="" set __BuildArch=x64 diff --git a/src/native/libs/build-native.cmd b/src/native/libs/build-native.cmd index 8585752889c34..aadcb949ec102 100644 --- a/src/native/libs/build-native.cmd +++ b/src/native/libs/build-native.cmd @@ -3,10 +3,14 @@ setlocal :SetupArgs :: Initialize the args that will be passed to cmake -set __sourceRootDir=%~dp0 -set __repoRoot=%~dp0..\..\.. -set __engNativeDir=%__repoRoot%\eng\native -set __artifactsDir=%__repoRoot%\artifacts +set "__sourceRootDir=%~dp0" +:: remove trailing slash +if %__sourceRootDir:~-1%==\ set "__sourceRootDir=%__sourceRootDir:~0,-1%" +set "__repoRoot=%__sourceRootDir%\..\..\.." +:: normalize +for %%i in ("%__repoRoot%") do set "__repoRoot=%%~fi" +set "__engNativeDir=%__repoRoot%\eng\native" +set "__artifactsDir=%__repoRoot%\artifacts" set __CMakeBinDir="" set __IntermediatesDir="" set __BuildArch=x64 diff --git a/src/tests/build.cmd b/src/tests/build.cmd index 57c656ac2789a..5f39518dda9b8 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -11,7 +11,8 @@ set "__ProjectDir=%~dp0" :: remove trailing slash if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%" set "__RepoRootDir=%__ProjectDir%\..\.." -for %%i in ("%__RepoRootDir%") do SET "__RepoRootDir=%%~fi" +:: normalize +for %%i in ("%__RepoRootDir%") do set "__RepoRootDir=%%~fi" set "__TestDir=%__RepoRootDir%\src\tests" diff --git a/src/tests/run.cmd b/src/tests/run.cmd index 5178ca466dc82..113deb87cbef1 100644 --- a/src/tests/run.cmd +++ b/src/tests/run.cmd @@ -12,6 +12,8 @@ set __TargetOS=windows set "__ProjectDir=%~dp0" set "__RepoRootDir=%~dp0..\.." +:: normalize +for %%i in ("%__RepoRootDir%") do set "__RepoRootDir=%%~fi" :: remove trailing slash if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%" set "__ProjectFilesDir=%__ProjectDir%" From 79c2e230117b35bd551b28e2c4fa34ea07061e60 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Sun, 15 Jan 2023 22:05:01 +0200 Subject: [PATCH 2/2] Delete unused variable --- eng/native/gen-buildsys.cmd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index 6f40a7e95609d..8e635f3537ac9 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -11,14 +11,9 @@ if %argC% lss 4 GOTO :USAGE if %1=="/?" GOTO :USAGE setlocal enabledelayedexpansion -set "basePath=%~dp0" set "__repoRoot=%~dp0..\.." :: normalize for %%i in ("%__repoRoot%") do set "__repoRoot=%%~fi" -:: remove quotes -set "basePath=%basePath:"=%" -:: remove trailing slash -if %basePath:~-1%==\ set "basePath=%basePath:~0,-1%" set __SourceDir=%1 set __IntermediatesDir=%2