diff options
author | Rahul Kumar <rahku@microsoft.com> | 2016-01-29 13:29:03 -0800 |
---|---|---|
committer | Rahul Kumar <rahku@microsoft.com> | 2016-01-29 13:33:01 -0800 |
commit | ff43d0423627be982913c9d10c47897517ff13be (patch) | |
tree | dbe39cc4641dea654b2bc5224e35b34a96766483 /src | |
parent | d4eccd4f55238388faf91e8f221235fa8a30105f (diff) | |
download | coreclr-ff43d0423627be982913c9d10c47897517ff13be.tar.gz coreclr-ff43d0423627be982913c9d10c47897517ff13be.tar.bz2 coreclr-ff43d0423627be982913c9d10c47897517ff13be.zip |
update version of buildtools
Diffstat (limited to 'src')
-rw-r--r-- | src/.nuget/packages.Unix.config | 6 | ||||
-rw-r--r-- | src/.nuget/packages.Windows_NT.config | 6 | ||||
-rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/scripts/buildtools/restorebuildtools.bat | 11 | ||||
-rw-r--r-- | src/scripts/buildtools/restorebuildtools.proj | 8 |
5 files changed, 0 insertions, 32 deletions
diff --git a/src/.nuget/packages.Unix.config b/src/.nuget/packages.Unix.config deleted file mode 100644 index 34039f8283..0000000000 --- a/src/.nuget/packages.Unix.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> - <package id="dnx-mono" version="1.0.0-rc2-16128" /> - <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" /> -</packages> diff --git a/src/.nuget/packages.Windows_NT.config b/src/.nuget/packages.Windows_NT.config deleted file mode 100644 index d2c4cf51ee..0000000000 --- a/src/.nuget/packages.Windows_NT.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00121" /> - <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.4-prerelease" /> - <package id="dnx-coreclr-win-x86" version="1.0.0-rc2-16128" /> -</packages> diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index 36bc12911e..1d428193f5 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -144,7 +144,6 @@ if(WIN32) add_custom_command(TARGET coreclr POST_BUILD - COMMAND ${CLR_DIR}/src/scripts/buildtools/restorebuildtools.bat COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TP ${PREPROCESS_DEFINITIONS} ${INC_DIR} /Fi${CMAKE_CURRENT_BINARY_DIR}/daccess.i ${CLR_DIR}/src/debug/daccess/daccess.cpp COMMAND ${BuildToolsDir}/dactablegen.exe /dac:${CMAKE_CURRENT_BINARY_DIR}/daccess.i /pdb:${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/coreclr.pdb /dll:$<TARGET_FILE:coreclr> /bin:${CMAKE_CURRENT_BINARY_DIR}/wks.bin COMMAND ${BuildToolsDir}/InjectResource.exe /bin:${CMAKE_CURRENT_BINARY_DIR}/wks.bin /dll:$<TARGET_FILE:coreclr> diff --git a/src/scripts/buildtools/restorebuildtools.bat b/src/scripts/buildtools/restorebuildtools.bat deleted file mode 100644 index a07e81759f..0000000000 --- a/src/scripts/buildtools/restorebuildtools.bat +++ /dev/null @@ -1,11 +0,0 @@ -REM ========================================================================================= -REM === -REM === Restore build tools required for native build -REM === -REM ========================================================================================= -echo Restore coreclr build tools nuget package -setlocal -:: Set the environment for the managed build -call "%__VSToolsRoot%\VsDevCmd.bat" -%_msbuildexe% "%~dp0restorebuildtools.proj" /p:OutputPath="%__IntermediatesDir%" /nodeReuse:false -endlocal
\ No newline at end of file diff --git a/src/scripts/buildtools/restorebuildtools.proj b/src/scripts/buildtools/restorebuildtools.proj deleted file mode 100644 index cc6c6d2ba9..0000000000 --- a/src/scripts/buildtools/restorebuildtools.proj +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\dir.props" /> - - <Import Project="..\..\..\dir.targets" /> - - <Import Project="..\..\..\dir.traversal.targets" /> -</Project>
\ No newline at end of file |