mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix up bootstrap script a bit

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2015-10-31 21:33:17 -07:00
parent fbedf48da2
commit cfb5a1836e
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/bootstrap.cmd
View file

@ -2,9 +2,6 @@
setlocal setlocal
REM Build 'dotnet' using a version of itself hosted on the DNX
REM The output of this is independent of DNX
REM This trick gets the absolute path from a relative path REM This trick gets the absolute path from a relative path
pushd %~dp0.. pushd %~dp0..
set REPOROOT=%CD% set REPOROOT=%CD%
@ -37,7 +34,7 @@ if not exist "%CMAKE_OUTPUT%" mkdir "%CMAKE_OUTPUT%"
pushd "%CMAKE_OUTPUT%" pushd "%CMAKE_OUTPUT%"
cmake .. -G "Visual Studio 14 2015 Win64" cmake .. -G "Visual Studio 14 2015 Win64"
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%
msbuild ALL_BUILD.vcxproj /p:Configuration="%CONFIGURATION%" "%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration="%CONFIGURATION%"
if exist "%HOST_DIR%" rd /s /q "%HOST_DIR%" if exist "%HOST_DIR%" rd /s /q "%HOST_DIR%"
mkdir "%HOST_DIR%" mkdir "%HOST_DIR%"
@ -128,9 +125,10 @@ set PATH=%STAGE2_DIR%;%START_PATH%
del "%REPOROOT%\test\TestApp\project.lock.json" del "%REPOROOT%\test\TestApp\project.lock.json"
dotnet restore "%REPOROOT%\test\TestApp" --runtime "%RID%" --quiet dotnet restore "%REPOROOT%\test\TestApp" --runtime "%RID%" --quiet
dotnet publish "%REPOROOT%\test\TestApp" --framework "%TFM%" --runtime "%RID%" --output "%REPOROOT%\artifacts\%RID%\smoketest" dotnet compile "%REPOROOT%\test\TestApp" --output "%REPOROOT%\artifacts\%RID%\smoketest"
"%REPOROOT%/artifacts/%RID%/smoketest/TestApp" 2>nul >nul set CLRHOST_CLR_PATH=%STAGE2_DIR%
"%REPOROOT%\artifacts\%RID%\smoketest\TestApp" 2>nul >nul
if errorlevel 1 goto fail if errorlevel 1 goto fail
REM Check that a compiler error is reported REM Check that a compiler error is reported

2
scripts/bootstrap.sh
View file

@ -43,7 +43,7 @@ DNX_ROOT="$(dirname $(which dotnet))/dnx"
banner "Restoring packages" banner "Restoring packages"
dotnet restore "$REPOROOT" --runtime osx.10.10-x64 --runtime ubuntu.14.04-x64 --runtime osx.10.11-x64 --quiet dotnet restore "$REPOROOT" --quiet
# Clean up stage1 # Clean up stage1
[ -d "$STAGE1_DIR" ] && rm -Rf "$STAGE1_DIR" [ -d "$STAGE1_DIR" ] && rm -Rf "$STAGE1_DIR"

14
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -18,25 +18,25 @@ if exist mscorlib.ni.dll (
copy /Y mscorlib.ni.dll mscorlib.dll > nul copy /Y mscorlib.ni.dll mscorlib.dll > nul
) )
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Reflection.Metadata.dll crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Reflection.Metadata.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.dll crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% csc.exe crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% csc.exe >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
popd popd

2
scripts/dotnet-restore.cmd
View file

@ -2,7 +2,7 @@
SETLOCAL SETLOCAL
SET ERRORLEVEL= SET ERRORLEVEL=
"%~dp0dnx\dnx" "%~dp0dnx\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore %* "%~dp0dnx\dnx" "%~dp0dnx\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" %*
exit /b %ERRORLEVEL% exit /b %ERRORLEVEL%
ENDLOCAL ENDLOCAL