diff --git a/source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj b/source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj index 5556ce222..07ea4eddd 100644 --- a/source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj +++ b/source/Cosmos.Build.Windows/Cosmos.Compiler.Builder.csproj @@ -14,14 +14,10 @@ 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - - - - - - - - + %24/IL2CPU/source/Cosmos.Build.Windows + . + https://tfs04.codeplex.com + {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} true Cosmos.snk Cosmos.ico diff --git a/source/TestKernels/Cosmos.TestRunner/Program.cs b/source/TestKernels/Cosmos.TestRunner/Program.cs index 53af15285..73a6367f9 100644 --- a/source/TestKernels/Cosmos.TestRunner/Program.cs +++ b/source/TestKernels/Cosmos.TestRunner/Program.cs @@ -50,10 +50,10 @@ namespace Cosmos.TestRunner { var xBuilder = new Builder() { - BuildPath = Options.BuildPath, - UseInternalAssembler = false + //BuildPath = xBuilder.B, + //UseInternalAssembler = false }; - Console.WriteLine("BuildPath = '{0}'", Options.BuildPath); + Console.WriteLine("BuildPath = '{0}'", xBuilder.BuildPath); xBuilder.TargetAssembly = xItem.Key.Assembly; var xEvent = new AutoResetEvent(false); xBuilder.CompileCompleted += delegate { xEvent.Set(); }; @@ -61,18 +61,28 @@ namespace Cosmos.TestRunner { 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(options); xEvent.WaitOne(); - if (NeedsToRunKernel) - { - xBuilder.Assemble(); - xBuilder.Link(); - xBuilder.MakeISO(); - var xISOFile = Path.Combine(xBuilder.BuildPath, "Cosmos.iso"); - // run qemu - xReturn = RunKernel(xItem.Key, xBuilder, xItem.Value, out xMessage); - } - else + //if (NeedsToRunKernel) //HACK! always false hardcode + //{ + // + // xBuilder.Assemble(); + // xBuilder.Link(); + // xBuilder.MakeISO(); + // var xISOFile = Path.Combine(xBuilder.BuildPath, "Cosmos.iso"); + // // run qemu + // xReturn = RunKernel(xItem.Key, xBuilder, xItem.Value, out xMessage); + //} + //else { xReturn = true; xMessage = ""; @@ -302,7 +312,7 @@ namespace Cosmos.TestRunner Tries++; 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)); // If it is connected...