Remove k command and use dnx instead

This commit is contained in:
Wei Wang 2015-03-24 17:34:51 -07:00
parent 3cd272a96a
commit 1d8f64d71c
3 changed files with 8 additions and 8 deletions

View File

@ -27,11 +27,11 @@ if test ! -d packages/KoreBuild; then
mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
fi fi
if ! type k > /dev/null 2>&1; then if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh source packages/KoreBuild/build/dnvm.sh
fi fi
if ! type k > /dev/null 2>&1; then if ! type dnx > /dev/null 2>&1; then
dnvm upgrade dnvm upgrade
fi fi

View File

@ -27,11 +27,11 @@ if test ! -d packages/KoreBuild; then
mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion mono .nuget/nuget.exe install Sake -version 0.2 -o packages -ExcludeVersion
fi fi
if ! type k > /dev/null 2>&1; then if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh source packages/KoreBuild/build/dnvm.sh
fi fi
if ! type k > /dev/null 2>&1; then if ! type dnx > /dev/null 2>&1; then
dnvm upgrade dnvm upgrade
fi fi

View File

@ -1,7 +1,7 @@
@{/* @{/*
k k
Run klr commands in your project. Executes k cmd. Run dnx commands in your project. Executes dnx cmd.
command='' command=''
dnvmUse='' dnvmUse=''
@ -12,6 +12,6 @@ default dnvmUse=''
var dnvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\dnvm' var dnvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\dnvm'
exec program='cmd' commandline='/C k ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)' exec program='cmd' commandline='/C dnx . ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)'
exec program='cmd' commandline='/C "${dnvmPath}" use ${dnvmUse} && k ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)' exec program='cmd' commandline='/C "${dnvmPath}" use ${dnvmUse} && dnx . ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)'
exec program='k' commandline='${command}' if='IsMono' exec program='dnx' commandline='. ${command}' if='IsMono'