diff options
| author | James Ko <jamesqko@gmail.com> | 2016-04-03 18:12:27 -0400 |
|---|---|---|
| committer | James Ko <jamesqko@gmail.com> | 2016-04-03 18:12:27 -0400 |
| commit | 7dfeac95b92db995921ac7fa8dfb5f7e9afd3bad (patch) | |
| tree | 4af981f5fe5f279a32e0c302c94304696c7693c1 | |
| parent | 48ce56b9fcd1b5edf5ca28f83d7b623b71e5c925 (diff) | |
| download | coreclr-7dfeac95b92db995921ac7fa8dfb5f7e9afd3bad.tar.gz coreclr-7dfeac95b92db995921ac7fa8dfb5f7e9afd3bad.tar.bz2 coreclr-7dfeac95b92db995921ac7fa8dfb5f7e9afd3bad.zip | |
Remove UseRoslynCompiler variable from the build system
| -rw-r--r-- | build.cmd | 3 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rw-r--r-- | tests/buildtest.cmd | 1 | ||||
| -rw-r--r-- | tests/override.targets | 2 | ||||
| -rw-r--r-- | tests/runtest.cmd | 1 |
5 files changed, 3 insertions, 8 deletions
@@ -19,8 +19,6 @@ set __ThisScriptPath="%~dp0" :: __TestWorkingDir -- default: %__RootBinDir%\tests\%__BuildOS%.%__BuildArch.%__BuildType%\ :: :: Thus, these variables are not simply internal to this script! -:: -:: The UseRoslynCompiler variable is used by src\mscorlib\GenerateCompilerResponseFile.targets. :: Set the default arguments for build set __BuildArch=x64 @@ -239,7 +237,6 @@ if not exist "%__VSToolsRoot%\VsDevCmd.bat" goto NoVS :MSBuild14 set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -set UseRoslynCompiler=true :CheckMSBuild14 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" if not exist %_msbuildexe% echo %__MsgPrefix%Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1 @@ -254,7 +254,7 @@ build_mscorlib() echo "Commencing build of mscorlib components for $__BuildOS.$__BuildArch.$__BuildType" # Invoke MSBuild - $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/build.proj" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/MSCorLib_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:UseRoslynCompiler=true /p:BuildNugetPackage=false /p:UseSharedCompilation=false ${__SignTypeReal} + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/build.proj" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/MSCorLib_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false ${__SignTypeReal} if [ $? -ne 0 ]; then echo "Failed to build mscorlib." @@ -300,7 +300,7 @@ generate_NugetPackages() echo "Generating nuget packages for "$__BuildOS # Invoke MSBuild - $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:UseRoslynCompiler=true /p:BuildNugetPackage=false /p:UseSharedCompilation=false + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false if [ $? -ne 0 ]; then echo "Failed to generate Nuget packages." diff --git a/tests/buildtest.cmd b/tests/buildtest.cmd index 99ab1a9f7a..349c0abc79 100644 --- a/tests/buildtest.cmd +++ b/tests/buildtest.cmd @@ -150,7 +150,6 @@ if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin goto :CheckMSBuild14 :MSBuild14 set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -set UseRoslynCompiler=true :CheckMSBuild14 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1 diff --git a/tests/override.targets b/tests/override.targets index 71a8b1f4f5..8593fe6aef 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -4,7 +4,7 @@ --> <Import Project="mono.targets" Condition="'$(OsEnvironment)'=='Unix'" /> - <Import Project="roslyn.xplat.targets" Condition="'$(OsEnvironment)'=='Unix' and '$(UseRoslynCompiler)'=='true'" /> + <Import Project="roslyn.xplat.targets" Condition="'$(OsEnvironment)'=='Unix'" /> <!-- Contains overrides for the nuget reference resolution. The regular nuget reference resolution will not copy references local, which we need in order to correctly execute the xunit project --> <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" /> diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 80ed02691a..794ad73bd6 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -105,7 +105,6 @@ if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin goto :CheckMSBuild14 :MSBuild14 set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" -set UseRoslynCompiler=true :CheckMSBuild14 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1 |