Builder

MisterLobo · Aug 10, 2017 · ac525c2 · ac525c2
1 parent d62f45f
commit ac525c2
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 1,065 deletions.
diff --git a/Build.sln b/Build.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26724.1
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D95021E1-A2C9-4829-819E-ED433AF13162}"
 EndProject
@@ -18,9 +18,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deploy", "Deploy", "{FD42844B-2767-4DF4-B0AF-EA5F7CB11528}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{9C8A3E55-9045-44CA-BFD4-16D5B4343A90}"
-	ProjectSection(SolutionItems) = preProject
-		XSharp Projects.txt = XSharp Projects.txt
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel", "Kernel", "{4D3F3613-E112-4013-AB81-B8CCED78A555}"
 EndProject
@@ -49,15 +46,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Wizards", "source
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Windows", "source\Cosmos.VS.Windows\Cosmos.VS.Windows.csproj", "{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.VS", "source\XSharp.VS\XSharp.VS.csproj", "{FB71E8EF-E229-4D81-984A-B9170D752BF9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.VS", "..\XSharp\source\XSharp.VS\XSharp.VS.csproj", "{FB71E8EF-E229-4D81-984A-B9170D752BF9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.USB", "source\Cosmos.Deploy.USB\Cosmos.Deploy.USB.csproj", "{3D84CF8B-C6DF-4D78-8DE1-708582B43711}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "source\Cosmos.Deploy.Pixie\Cosmos.Deploy.Pixie.csproj", "{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.Nasm", "source\XSharp.Nasm\XSharp.Nasm.csproj", "{841A734E-9606-4AAB-9C4A-74E7E303FF5D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.Nasm", "..\XSharp\source\XSharp.Nasm\XSharp.Nasm.csproj", "{841A734E-9606-4AAB-9C4A-74E7E303FF5D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Compiler", "source\XSharp.Compiler\XSharp.Compiler.csproj", "{69E08155-F075-4728-8387-1549CFD4FA97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Compiler", "..\XSharp\source\XSharp.Compiler\XSharp.Compiler.csproj", "{69E08155-F075-4728-8387-1549CFD4FA97}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "source\IL2CPU\IL2CPU.csproj", "{F3025446-D2C7-4FEA-AB03-C707F7B48B43}"
 EndProject
@@ -79,7 +76,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core", "source\Cosmo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL2", "source\Cosmos.HAL2\Cosmos.HAL2.csproj", "{DE4F000A-B65C-4395-B066-891B7423E9EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "source\XSharp.Common\XSharp.Common.csproj", "{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core_Plugs", "source\Cosmos.Core_Plugs\Cosmos.Core_Plugs.csproj", "{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}"
 EndProject
@@ -89,7 +86,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System2_Plugs", "sou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel.Plugs.Asm", "source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj", "{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}"
 EndProject

diff --git a/Cosmos.sln b/Cosmos.sln
diff --git a/Cosmos.sln.DotSettings b/Cosmos.sln.DotSettings
diff --git a/Kernel.sln b/Kernel.sln
@@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.DebugStub", "so
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel G3", "Kernel G3", "{00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Shared", "source\Kernel-X86\90-Shared\Cosmos.Shared\Cosmos.Shared.csproj", "{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.CPU.x86", "source\Kernel-X86\10-CPU\Cosmos.CPU.x86\Cosmos.CPU.x86.csproj", "{FC65D765-990D-4F00-B240-8DD17FA91EA9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Platform.PC", "source\Kernel-X86\20-Platform\Cosmos.Platform.PC\Cosmos.Platform.PC.csproj", "{63843265-D889-47D2-883E-595289C99F42}"
@@ -64,11 +62,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "40 System", "40 System", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50 Application", "50 Application", "{2A22DC4C-E237-4D4B-A592-47D477F9ED5B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "90 Shared", "90 Shared", "{EFB323E2-300A-4BC8-9A61-9E1D0E0C1FCD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.HAL", "source\Kernel-X86\30-HAL\Cosmos.HAL\Cosmos.HAL.csproj", "{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E}"
 EndProject
@@ -98,7 +94,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernel", "Demos\Guess\
 EndProject
 Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GuessKernelBoot", "Demos\Guess\GuessKernelBoot.Cosmos", "{B612BDBD-DF82-43DB-873D-AA6F2E9369A5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "91 Plugs", "91 Plugs", "{1B2F7229-B8F1-4F40-966A-AA8C2DC30A54}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "91 Plug", "91 Plug", "{1B2F7229-B8F1-4F40-966A-AA8C2DC30A54}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "92 CpuPlug", "92 CpuPlug", "{AD495579-C209-48FA-8F0F-633D22438DDD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -212,14 +210,6 @@ Global
 		{9BDA0399-0CFD-42E8-8CF4-3DDE16122A82}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BDA0399-0CFD-42E8-8CF4-3DDE16122A82}.Release|x86.ActiveCfg = Release|Any CPU
 		{9BDA0399-0CFD-42E8-8CF4-3DDE16122A82}.Release|x86.Build.0 = Release|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Debug|x86.Build.0 = Debug|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Release|x86.ActiveCfg = Release|Any CPU
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31}.Release|x86.Build.0 = Release|Any CPU
 		{FC65D765-990D-4F00-B240-8DD17FA91EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC65D765-990D-4F00-B240-8DD17FA91EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC65D765-990D-4F00-B240-8DD17FA91EA9}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -385,7 +375,6 @@ Global
 		{79D68062-46C5-466D-9289-C033F7348485} = {A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7}
 		{31D48401-77B2-44AF-B6D3-27AB67C10759} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{9BDA0399-0CFD-42E8-8CF4-3DDE16122A82} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
-		{4DCF5D4A-29C3-4D14-82E8-B13C55A93F31} = {EFB323E2-300A-4BC8-9A61-9E1D0E0C1FCD}
 		{FC65D765-990D-4F00-B240-8DD17FA91EA9} = {C5D22A6E-96F8-4F85-9EE4-C1EB8C5E0530}
 		{63843265-D889-47D2-883E-595289C99F42} = {2C27BF1B-0AB0-4B68-83C4-991D43897B66}
 		{F8BF6943-B69D-4549-9C16-75146616E19C} = {2E1A72C6-5DD4-4AB9-92A1-6BB44D9B1009}
@@ -394,15 +383,14 @@ Global
 		{B369DAF1-94BC-4BD7-887C-80F76F8B5910} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
 		{2E1A72C6-5DD4-4AB9-92A1-6BB44D9B1009} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
 		{2A22DC4C-E237-4D4B-A592-47D477F9ED5B} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
-		{EFB323E2-300A-4BC8-9A61-9E1D0E0C1FCD} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
 		{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{F785B091-7E4D-4D2E-A310-B18690623F74} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{3F8EDE0E-61BD-4D01-95F5-4A5A17F6221E} = {B369DAF1-94BC-4BD7-887C-80F76F8B5910}
 		{47F9D446-ACD4-489A-AD6D-A46A19247E2F} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{67FD9912-CE63-4EB2-880C-F4F0D9AED7CA} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{4E9B8F31-AEA0-402D-9B3A-223100F2156D} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{BEEDA0BE-0105-40BF-BD8D-7F6A2BC3B05C} = {1B2F7229-B8F1-4F40-966A-AA8C2DC30A54}
-		{365810FC-AFC2-4130-8A70-EF1F2C3FA5D6} = {1B2F7229-B8F1-4F40-966A-AA8C2DC30A54}
+		{365810FC-AFC2-4130-8A70-EF1F2C3FA5D6} = {AD495579-C209-48FA-8F0F-633D22438DDD}
 		{08B5D5EF-45F5-45BC-B842-A413E8113A55} = {C5D22A6E-96F8-4F85-9EE4-C1EB8C5E0530}
 		{DB771C12-E60D-41C9-9A39-74CC95A661CD} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
 		{9E58E949-7B71-45ED-9610-11DA287EE933} = {2A22DC4C-E237-4D4B-A592-47D477F9ED5B}
@@ -412,5 +400,6 @@ Global
 		{E35E0DBF-555F-4D38-8F28-ACDFA9DC97BD} = {5FF9BF2A-5162-4F12-82B6-1693AD776636}
 		{B612BDBD-DF82-43DB-873D-AA6F2E9369A5} = {5FF9BF2A-5162-4F12-82B6-1693AD776636}
 		{1B2F7229-B8F1-4F40-966A-AA8C2DC30A54} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
+		{AD495579-C209-48FA-8F0F-633D22438DDD} = {00F0CA9C-51B2-4E99-B4D9-DD24D488D3FC}
 	EndGlobalSection
 EndGlobal
diff --git a/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj b/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj
@@ -71,7 +71,7 @@
     <Compile Include="ThreadImpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\..\..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>

diff --git a/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj b/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj
@@ -67,7 +67,7 @@
     <Compile Include="VFS\PathImpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
+    <ProjectReference Include="..\..\..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>
     </ProjectReference>

diff --git a/source/Cosmos.Build.Builder/App.xaml.cs b/source/Cosmos.Build.Builder/App.xaml.cs
@@ -11,9 +11,7 @@ public partial class App : Application {
     public static bool IsUserKit;
     public static bool ResetHive;
     public static bool StayOpen;
-    public static bool UseTask;
     public static bool NoMSBuildClean;
-    public static bool InstallTask;
     public static bool UseVsHive;
     public static Dictionary<string, string> mArgs = new Dictionary<string, string>();
 
@@ -32,16 +30,14 @@ protected override void OnStartup(StartupEventArgs e) {
       IsUserKit = mArgs.ContainsKey("USERKIT");
       ResetHive = mArgs.ContainsKey("RESETHIVE");
       StayOpen = mArgs.ContainsKey("STAYOPEN");
-      UseTask = !mArgs.ContainsKey("NOTASK");
       NoMSBuildClean = mArgs.ContainsKey("NOCLEAN");
-      InstallTask = mArgs.ContainsKey("INSTALLTASK");
       DoNotLaunchVS = mArgs.ContainsKey("NOVSLAUNCH");
       UseVsHive = mArgs.ContainsKey("VSEXPHIVE");
 
       if (mArgs.ContainsKey("VSPATH")) {
         Paths.VSPath = mArgs["VSPATH"];
         Paths.UpdateVSPath();
-      } else if (!InstallTask) {
+      } else {
         throw new ArgumentNullException(nameof(e.Args), "Visual Studio path must be provided. (-VSPATH or /VSPATH)");
       }
 

diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -40,10 +40,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Interop.TaskScheduler">
-      <HintPath>.\Interop.TaskScheduler.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="NuGet.Common, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NuGet.Common.4.2.0\lib\net45\NuGet.Common.dll</HintPath>

diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -403,29 +403,7 @@ private void RunSetup() {
 
       string setupName = GetSetupName(mReleaseNo);
 
-      if (App.UseTask) {
-        // This is a hack to avoid the UAC dialog on every run which can be very disturbing if you run
-        // the dev kit a lot.
-        Start(@"schtasks.exe", @"/run /tn " + Quoted("CosmosSetup"), true, false);
-
-        // Must check for start before stop, else on slow machines we exit quickly because Exit is found before
-        // it starts.
-        // Some slow user PCs take around 5 seconds to start up the task...
-        int xSeconds = 10;
-        var xTimed = DateTime.Now;
-        Log.WriteLine("Waiting " + xSeconds + " seconds for Setup to start.");
-        if (WaitForStart(setupName, xSeconds * 1000)) {
-          mExceptionList.Add("Setup did not start.");
-          return;
-        }
-        Log.WriteLine("Setup is running. " + DateTime.Now.Subtract(xTimed).ToString(@"ss\.fff"));
-
-        // Scheduler starts it and exits, but we need to wait for the setup itself to exit before proceding
-        Log.WriteLine("Waiting for Setup to complete.");
-        WaitForExit(setupName);
-      } else {
-        Start(mCosmosPath + @"Setup\Output\" + setupName + ".exe", @"/SILENT");
-      }
+      Start(mCosmosPath + @"Setup\Output\" + setupName + ".exe", @"/SILENT");
     }
 
     private void Done() {