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

Revert "Execute correct commands when building with Core CLR on Linux" 

- bad merge; this commit should not have been included

This reverts commit 18d637dfc7.
This commit is contained in:
Doug Bunting 2015-10-01 14:29:26 -07:00
parent 580fe5b651
commit aa2beb83c2
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/_git.shade
View File

@ -2,6 +2,6 @@
default gitFolder=''
-// Use cmd to invoke git so that people who have git as a 'cmd'
exec program='cmd' commandline='/C git ${gitCommand}' workingdir='${gitFolder}' if='!IsLinux'
exec program='git' commandline='${gitCommand}' workingdir='${gitFolder}' if='IsLinux'
exec program='cmd' commandline='/C git ${gitCommand}' workingdir='${gitFolder}' if='!IsMono'
exec program='git' commandline='${gitCommand}' workingdir='${gitFolder}' if='IsMono'

4
build/_k-restore.shade
View File

@ -12,5 +12,5 @@ default restoreDir = '${ currentDir }'
default restore_options='${ E("NUGET3_restore_options") }'
exec program='cmd' commandline='/C dnu restore --parallel ${ restore_options }' workingdir='${ restoreDir }' if='!IsLinux'
exec program='dnu' commandline='restore ${ restore_options }' workingdir='${ restoreDir }' if='IsLinux'
exec program='cmd' commandline='/C dnu restore --parallel ${ restore_options }' workingdir='${ restoreDir }' if='!IsMono'
exec program='dnu' commandline='restore ${ restore_options }' workingdir='${ restoreDir }' if='IsMono'

2
build/_k-standard-goals.shade
View File

@ -151,7 +151,7 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json'
}
}
#native-compile target='compile' if='!IsLinux && Directory.Exists(Path.Combine(BASE_DIR, "src"))'
#native-compile target='compile' if='!IsMono && Directory.Exists(Path.Combine(BASE_DIR, "src"))'
var programFilesX86 = '${Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}'
var nativeProjects ='${Files.Include(Path.Combine(BASE_DIR, "src", "**", "*.vcxproj"))}'

6
build/_k.shade
View File

@ -12,6 +12,6 @@ default dnvmUse=''
var dnvmPath='${Directory.GetCurrentDirectory()}\packages\KoreBuild\build\dnvm'
exec program='cmd' commandline='/C dnx ${command}' if='!IsLinux && string.IsNullOrEmpty(dnvmUse)'
exec program='cmd' commandline='/C "${dnvmPath}" run ${dnvmUse} ${command}' if='!IsLinux && !string.IsNullOrEmpty(dnvmUse)'
exec program='dnx' commandline='${command}' if='IsLinux'
exec program='cmd' commandline='/C dnx ${command}' if='!IsMono && string.IsNullOrEmpty(dnvmUse)'
exec program='cmd' commandline='/C "${dnvmPath}" run ${dnvmUse} ${command}' if='!IsMono && !string.IsNullOrEmpty(dnvmUse)'
exec program='dnx' commandline='${command}' if='IsMono'

4
build/_kpm-build.shade
View File

@ -37,7 +37,7 @@ default build_options='${E("NUGET3_build_options")}'
var projectsArg=projectFile.Replace(";", " ");
var dnuArgs=string.Format("build{0} {1} --configuration {2}", build_options, projectsArg, configuration);
if (!IsLinux)
if (!IsMono)
{
Exec("cmd", "/C dnu " + dnuArgs);
}
@ -54,7 +54,7 @@ default build_options='${E("NUGET3_build_options")}'
DeleteFolder(projectBin);
var dnuArgs=string.Format("build{0} {1} --configuration {2}", build_options, projectFolder, configuration);
if (!IsLinux)
if (!IsMono)
{
Exec("cmd", "/C dnu " + dnuArgs);
}

4
build/_kpm-pack.shade
View File

@ -40,7 +40,7 @@ default pack_options='${E("NUGET3_pack_options")}'
var projectsArg=projectFile.Replace(";", " ");
var dnuArgs=string.Format("pack{0} {1} --configuration {2}", pack_options, projectsArg, configuration);
if (!IsLinux)
if (!IsMono)
{
Exec("cmd", "/C dnu " + dnuArgs);
}
@ -66,7 +66,7 @@ default pack_options='${E("NUGET3_pack_options")}'
DeleteFolder(projectBin);
var dnuArgs=string.Format("pack{0} {1} --configuration {2}", pack_options, projectFolder, configuration);
if (!IsLinux)
if (!IsMono)
{
Exec("cmd", "/C dnu " + dnuArgs);
}

4
build/_kpm-publish.shade
View File

@ -17,5 +17,5 @@ default targetPackagesDir=''
.Where(p => !p.EndsWith(".symbols.nupkg"));
}
exec program='cmd' commandline='/C dnu packages add ${package} ${targetPackagesDir}' if='!IsLinux' each='var package in packages'
exec program='dnu' commandline='packages add ${package} ${targetPackagesDir}' if='IsLinux' each='var package in packages'
exec program='cmd' commandline='/C dnu packages add ${package} ${targetPackagesDir}' if='!IsMono' each='var package in packages'
exec program='dnu' commandline='packages add ${package} ${targetPackagesDir}' if='IsMono' each='var package in packages'