diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2015-07-06 16:12:43 -0700 |
|---|---|---|
| committer | Matt Mitchell <mmitche@microsoft.com> | 2015-07-09 16:20:11 -0700 |
| commit | 1972ec27c9a570460dde377ff910325b0017507b (patch) | |
| tree | 7c3aa8f49005bfaa5c6a8742427783aac778e195 /build.cmd | |
| parent | eed62e377af693f0288587a3600c89e258e614a6 (diff) | |
| download | coreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.gz coreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.bz2 coreclr-1972ec27c9a570460dde377ff910325b0017507b.zip | |
Move CoreCLR to the modern build tools and dnx
This changes moves coreclr onto DNX (same version as corefx). Theoretically, this should allow these tests to target the desktop CLR. All of the old package.config files are gone and replaced with corresponding project.json files. The up front restore behavior is retained. Tests are now buildable individually, though not runnable in a similar fashion.
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -51,7 +51,6 @@ echo. set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__IntermediatesDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__PackagesBinDir=%__BinDir%\.nuget" -set "__ToolsDir=%__RootBinDir%\tools" set "__TestBinDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__TestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" @@ -183,7 +182,7 @@ call "!VS%__VSProductVersion%COMNTOOLS!\VsDevCmd.bat" echo Commencing build of mscorlib for %__BuildOS%.%__BuildArch%.%__BuildType% echo. set "__MScorlibBuildLog=%__LogsDir%\MScorlib_%__BuildOS%__%__BuildArch%__%__BuildType%.log" -%_msbuildexe% "%__ProjectFilesDir%\build.proj" %__MSBCleanBuildArgs% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__MScorlibBuildLog%" /p:OS=%__BuildOS% %__AdditionalMSBuildArgs% +%_msbuildexe% "%__ProjectFilesDir%\build.proj" %__MSBCleanBuildArgs% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__MScorlibBuildLog%" /p:OSGroup=%__BuildOS% %__AdditionalMSBuildArgs% IF NOT ERRORLEVEL 1 ( if defined __MscorlibOnly exit /b 0 goto CrossGenMscorlib @@ -208,7 +207,7 @@ exit /b 1 echo. echo Commencing build of tests for %__BuildOS%.%__BuildArch%.%__BuildType% echo. -call tests\buildtest.cmd +call %__ProjectDir%\tests\buildtest.cmd IF NOT ERRORLEVEL 1 goto SuccessfulBuild echo Test binaries build failed. Refer !__MScorlibBuildLog! for details. exit /b 1 |