summaryrefslogtreecommitdiff
path: root/build.cmd
diff options
context:
space:
mode:
authorMatt Mitchell <mmitche@microsoft.com>2015-03-11 11:45:35 -0700
committerMatt Mitchell <mmitche@microsoft.com>2015-03-16 13:23:18 -0700
commitf8ac5bbef56de08051dace78e9334af89de15da0 (patch)
treef3408da6eb3120f9cd38cd24f74587f658680aad /build.cmd
parente17f380d6308c9ef7070b2193eedacfcc60a86b1 (diff)
downloadcoreclr-f8ac5bbef56de08051dace78e9334af89de15da0.tar.gz
coreclr-f8ac5bbef56de08051dace78e9334af89de15da0.tar.bz2
coreclr-f8ac5bbef56de08051dace78e9334af89de15da0.zip
Fixes for building tests alone
This change fixes an issue where tests cannot be built alone as well as cleans up the paths. The general path cleanup was done so that the path format and variable names generally follow the main build of the coreclr repo. Some highlights are: * Don't use Cmake as a directory name for intermediates, use intermediates instead. * Disable 4820 warning (this is about padding) when building tests. Reduces noise in output significantly * Some fixes in typos and casing in the project files and build scripts
Diffstat (limited to 'build.cmd')
-rw-r--r--build.cmd10
1 files changed, 2 insertions, 8 deletions
diff --git a/build.cmd b/build.cmd
index 87b3702ba7..19ec773abf 100644
--- a/build.cmd
+++ b/build.cmd
@@ -47,7 +47,7 @@ set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%"
set "__IntermediatesDir=%__RootBinDir%\intermediates\%__BuildOS%.%__BuildArch%.%__BuildType%"
set "__PackagesBinDir=%__BinDir%\.nuget"
set "__ToolsDir=%__RootBinDir%\tools"
-set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%"
+set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%"
:: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash
set "__CMakeBinDir=%__BinDir%"
@@ -64,12 +64,6 @@ set __MSBCleanBuildArgs=/t:rebuild
:: Cleanup the binaries drop folder
if exist "%__RootBinDir%" rd /s /q "%__RootBinDir%"
-:: Cleanup the logs folder
-if exist "%__LogsDir%" rd /s /q "%__LogsDir%"
-
-::Cleanup intermediates folder
-if exist "%__IntermediatesDir%" rd /s /q "%__IntermediatesDir%"
-
:MakeDirectories
if not exist "%__BinDir%" md "%__BinDir%"
if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%"
@@ -188,7 +182,7 @@ goto :eof
echo Repo successfully built.
echo.
echo Product binaries are available at !__BinDir!
-echo Test binaries are available at !__TestWorkingDir!
+echo Test binaries are available at !__TestBinDir!
goto :eof
:Usage