dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
bklooste_cp 2009-05-16 12:43:51 +00:00
parent ddeffbda62
commit 61272dd6ff
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj
View file

@ -14,14 +14,10 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<SccProjectName> <SccProjectName>%24/IL2CPU/source/Cosmos.Build.Windows</SccProjectName>
</SccProjectName> <SccLocalPath>.</SccLocalPath>
<SccLocalPath> <SccAuxPath>https://tfs04.codeplex.com</SccAuxPath>
</SccLocalPath> <SccProvider>{4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}</SccProvider>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Cosmos.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>Cosmos.snk</AssemblyOriginatorKeyFile>
<ApplicationIcon>Cosmos.ico</ApplicationIcon> <ApplicationIcon>Cosmos.ico</ApplicationIcon>

38
source/TestKernels/Cosmos.TestRunner/Program.cs
View file

@ -50,10 +50,10 @@ namespace Cosmos.TestRunner
{ {
var xBuilder = new Builder() var xBuilder = new Builder()
{ {
BuildPath = Options.BuildPath, //BuildPath = xBuilder.B,
UseInternalAssembler = false //UseInternalAssembler = false
}; };
Console.WriteLine("BuildPath = '{0}'", Options.BuildPath); Console.WriteLine("BuildPath = '{0}'", xBuilder.BuildPath);
xBuilder.TargetAssembly = xItem.Key.Assembly; xBuilder.TargetAssembly = xItem.Key.Assembly;
var xEvent = new AutoResetEvent(false); var xEvent = new AutoResetEvent(false);
xBuilder.CompileCompleted += delegate { xEvent.Set(); }; xBuilder.CompileCompleted += delegate { xEvent.Set(); };
@ -61,18 +61,28 @@ namespace Cosmos.TestRunner
{ {
Console.WriteLine("Log: {0} - {1}", aSeverity, aMessage); Console.WriteLine("Log: {0} - {1}", aSeverity, aMessage);
}; };
//var options = Cosmos.Compiler.Builder.BuildOptions.Load();
//options.DebugMode = DebugMode.None;
//options.DebugPortId = 0;
//options.UseGDB = false;
xBuilder.BeginCompile(DebugMode.None, 0, false); xBuilder.BeginCompile(DebugMode.None, 0, false);
// xBuilder.BeginCompile(options);
xEvent.WaitOne(); xEvent.WaitOne();
if (NeedsToRunKernel) //if (NeedsToRunKernel) //HACK! always false hardcode
{ //{
xBuilder.Assemble(); //
xBuilder.Link(); // xBuilder.Assemble();
xBuilder.MakeISO(); // xBuilder.Link();
var xISOFile = Path.Combine(xBuilder.BuildPath, "Cosmos.iso"); // xBuilder.MakeISO();
// run qemu // var xISOFile = Path.Combine(xBuilder.BuildPath, "Cosmos.iso");
xReturn = RunKernel(xItem.Key, xBuilder, xItem.Value, out xMessage); // // run qemu
} // xReturn = RunKernel(xItem.Key, xBuilder, xItem.Value, out xMessage);
else //}
//else
{ {
xReturn = true; xReturn = true;
xMessage = ""; xMessage = "";
@ -302,7 +312,7 @@ namespace Cosmos.TestRunner
Tries++; Tries++;
Thread.Sleep(10000); Thread.Sleep(10000);
} }
// It tries to connect until it is connected or 50 seconds have passed from the first try. // It tries to connect until it is connected or 50 seconds have passed from the first try.
} while ((!xClientSocket.Connected) && (Tries < 5)); } while ((!xClientSocket.Connected) && (Tries < 5));
// If it is connected... // If it is connected...