huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to aspnet/Universe#290 fix 

- pick up latest `build.cmd` and `build.sh` files
  - preserve installation of x64 DNX packages in this repo
This commit is contained in:
Doug Bunting 2015-10-11 00:48:26 -07:00
parent 13dcc60802
commit 1899a4ffc2
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build.cmd
View File

@ -2,14 +2,15 @@
cd %~dp0 cd %~dp0
SETLOCAL SETLOCAL
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe SET NUGET_VERSION=latest
SET CACHED_NUGET=%LocalAppData%\NuGet\nuget.%NUGET_VERSION%.exe
SET BUILDCMD_KOREBUILD_VERSION="" SET BUILDCMD_KOREBUILD_VERSION=""
SET BUILDCMD_DNX_VERSION="" SET BUILDCMD_DNX_VERSION=""
IF EXIST %CACHED_NUGET% goto copynuget IF EXIST %CACHED_NUGET% goto copynuget
echo Downloading latest version of NuGet.exe... echo Downloading latest version of NuGet.exe...
IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'" @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
:copynuget :copynuget
IF EXIST .nuget\nuget.exe goto restore IF EXIST .nuget\nuget.exe goto restore
@ -17,24 +18,25 @@ md .nuget
copy %CACHED_NUGET% .nuget\nuget.exe > nul copy %CACHED_NUGET% .nuget\nuget.exe > nul
:restore :restore
IF EXIST packages\KoreBuild goto run IF EXIST packages\Sake goto getdnx
IF %BUILDCMD_KOREBUILD_VERSION%=="" ( IF %BUILDCMD_KOREBUILD_VERSION%=="" (
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
) ELSE ( ) ELSE (
.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
) )
.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages .nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
IF "%SKIP_DNX_INSTALL%"=="1" goto run :getdnx
IF %BUILDCMD_DNX_VERSION%=="" ( IF "%SKIP_DNX_INSTALL%"=="" (
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 IF "%BUILDCMD_DNX_VERSION%"=="" (
) ELSE ( BUILDCMD_DNX_VERSION=latest
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -alias default
) )
CALL packages\KoreBuild\build\dnvm install default -arch x64 CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64 CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64
CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x64
:run CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
) ELSE (
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86 CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
)
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %* packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

19
build.sh
View File

@ -10,19 +10,21 @@ else
fi fi
fi fi
mkdir -p $cachedir mkdir -p $cachedir
nugetVersion=latest
cachePath=$cachedir/nuget.$nugetVersion.exe
url=https://www.nuget.org/nuget.exe url=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
if test ! -f $cachedir/nuget.exe; then if test ! -f $cachePath; then
wget -O $cachedir/nuget.exe $url 2>/dev/null || curl -o $cachedir/nuget.exe --location $url /dev/null wget -O $cachePath $url 2>/dev/null || curl -o $cachePath --location $url /dev/null
fi fi
if test ! -e .nuget; then if test ! -e .nuget; then
mkdir .nuget mkdir .nuget
cp $cachedir/nuget.exe .nuget/nuget.exe cp $cachePath .nuget/nuget.exe
fi fi
if test ! -d packages/KoreBuild; then if test ! -d packages/Sake; then
mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
fi fi
@ -31,8 +33,11 @@ if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh source packages/KoreBuild/build/dnvm.sh
fi fi
if ! type dnx > /dev/null 2>&1; then if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
dnvm upgrade dnvm install latest -runtime coreclr -alias default
dnvm install default -runtime mono -alias default
else
dnvm use default -runtime mono
fi fi
mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@" mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"