diff options
| author | Anirudh Agnihotry <anirudhagnihotry098@gmail.com> | 2020-03-05 18:51:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 18:51:06 +0300 |
| commit | fef9ca70f6e7268dfc9e0f600433f5293932f166 (patch) | |
| tree | 53ff21a1864acf0570ce205e3065439dc2a2ee0f /src/coreclr/crossgen-corelib.cmd | |
| parent | 2f6e072c97738a56eeeb25f1fdb5dcc955649db0 (diff) | |
Replacing OSGroup with TargetOS for coreclr, libraries and installer (#32833)
* Remove OSGroup from coreclr and corefx
* remove from installer
* fixing coreclr tests
* Some documentation changes
Co-Authored-By: Viktor Hofer <viktor.hofer@microsoft.com>
* moving buildos calculation to config.props
* BuildOS -> TargetOS
* remove osgroup suffix
* removing comment and correcting typo
* dotnet msbuild -> dotnet build at relevant places in docs
* moving more properties to configuration.props
* refactoring properties
* moving TargetArchitecture property to loveBuildd.Targets
* adding configuration.props to signing
* Fix installer build
* BuildOS -> Target os and removing slash
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Diffstat (limited to 'src/coreclr/crossgen-corelib.cmd')
| -rw-r--r-- | src/coreclr/crossgen-corelib.cmd | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/coreclr/crossgen-corelib.cmd b/src/coreclr/crossgen-corelib.cmd index 7cd05c3e8e0..f47aa179909 100644 --- a/src/coreclr/crossgen-corelib.cmd +++ b/src/coreclr/crossgen-corelib.cmd @@ -13,11 +13,11 @@ set __ThisScriptDir="%~dp0" :: Note that the msbuild project files (specifically, dir.proj) will use the following variables, if set: :: __BuildArch -- default: x64 :: __BuildType -- default: Debug -:: __BuildOS -- default: Windows_NT +:: __TargetOS -- default: Windows_NT :: __ProjectDir -- default: directory of the dir.props file :: __RepoRootDir -- default: directory two levels above the dir.props file :: __RootBinDir -- default: %__RepoRootDir%\artifacts\ -:: __BinDir -- default: %__RootBinDir%\%__BuildOS%.%__BuildArch.%__BuildType%\ +:: __BinDir -- default: %__RootBinDir%\%__TargetOS%.%__BuildArch.%__BuildType%\ :: __IntermediatesDir :: __PackagesBinDir -- default: %__BinDir%\.nuget :: @@ -26,7 +26,7 @@ set __ThisScriptDir="%~dp0" :: Set the default arguments for build set __BuildArch=x64 set __BuildType=Debug -set __BuildOS=Windows_NT +set __TargetOS=Windows_NT set "__ProjectDir=%~dp0" :: remove trailing slash @@ -120,13 +120,13 @@ if %__BuildTypeDebug%==1 set __BuildType=Debug if %__BuildTypeChecked%==1 set __BuildType=Checked if %__BuildTypeRelease%==1 set __BuildType=Release -set "__BinDir=%__RootBinDir%\bin\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__IntermediatesDir=%__RootBinDir%\obj\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__BinDir=%__RootBinDir%\bin\coreclr\%__TargetOS%.%__BuildArch%.%__BuildType%" +set "__IntermediatesDir=%__RootBinDir%\obj\coreclr\%__TargetOS%.%__BuildArch%.%__BuildType%" set "__CrossComponentBinDir=%__BinDir%" if NOT "%__CrossArch%" == "" set __CrossComponentBinDir=%__CrossComponentBinDir%\%__CrossArch% -set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log" +set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenCoreLib_%__TargetOS%__%__BuildArch%__%__BuildType%.log" set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe" if not exist "%__BinDir%" md "%__BinDir%" @@ -167,7 +167,7 @@ if not defined VSINSTALLDIR ( ) if not exist "!VSINSTALLDIR!DIA SDK" goto NoDIA -echo %__MsgPrefix%Generating native image of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%. Logging to "%__CrossGenCoreLibLog%". +echo %__MsgPrefix%Generating native image of System.Private.CoreLib for %__TargetOS%.%__BuildArch%.%__BuildType%. Logging to "%__CrossGenCoreLibLog%". if exist "%__CrossGenCoreLibLog%" del "%__CrossGenCoreLibLog%" REM Need VS native tools environment for the **target** arch when running instrumented binaries |