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

Fixed sample generation to use new command line.

This commit is contained in:
David Fowler 2014-02-12 15:20:39 -08:00
parent 1c6f185989
commit 95d5324bcf
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
build/_k-generate-projects.shade
View File

@ -366,24 +366,43 @@ functions
private static string GenerateStartupAction(string projectRoot, string projectName, string packagesDir, string configType) private static string GenerateStartupAction(string projectRoot, string projectName, string packagesDir, string configType)
{ {
// packages\ProjectK.*\tools\bin\klr.exe  // packages\ProjectK.*\tools\bin\x86\klr.exe 
// packages\ProjectK.*\tools\Microsoft.Net.ApplicationHost\bin\net45\Microsoft.Net.ApplicationHost.dll  // packages\ProjectK.*\tools\net45
string klrPath = Directory.EnumerateFiles(packagesDir, "klr.exe", SearchOption.AllDirectories).FirstOrDefault(); Func<string, long> getVersion = version => {
if (klrPath == null) var dash = version.LastIndexOf('-');
if(dash != -1)
{
var lastToken = version.Substring(dash + 1);
if(lastToken.StartsWith("t"))
{
return Int64.Parse(lastToken.Substring(1));
}
return Int64.Parse(lastToken);
}
return Int64.MaxValue;
};
var projectK = Directory.GetDirectories(packagesDir, "ProjectK*")
.Select(p => new { Path = p, Build = getVersion(p) })
.OrderByDescending(p => p.Build)
.FirstOrDefault();
if (projectK == null)
{ {
Warn("Unable to locate klr.exe under packages"); Warn("Unable to locate project K package");
return ""; return "";
} }
var toolsDir = Path.GetDirectoryName(Path.GetDirectoryName(klrPath)); var toolsDir = Path.Combine(projectK.Path, "tools");
var appHostPath = Path.Combine(toolsDir, var klrPath = Path.Combine(toolsDir, "bin", "x86", "klr.exe");
"Microsoft.Net.ApplicationHost",
configType,
"Microsoft.Net.ApplicationHost.dll");
var klrSwitches = configType == "k10" ? "--core45" : "--net45"; var klrSwitches = configType == "k10" ? "--core45" : "--net45";
var args = klrSwitches + " " + appHostPath + " --nobin " + projectRoot; klrSwitches += " --appbase " + projectRoot + " --lib " + Path.Combine(toolsDir, configType);
var args = klrSwitches + " Microsoft.Net.ApplicationHost --nobin ";
return String.Format(@"<StartAction>Program</StartAction> return String.Format(@"<StartAction>Program</StartAction>
<StartProgram>{0}</StartProgram> <StartProgram>{0}</StartProgram>