diff --git a/Build/VSIP/install.bat b/Build/VSIP/install.bat index 2e5cc5a53..b33d34f0e 100644 --- a/Build/VSIP/install.bat +++ b/Build/VSIP/install.bat @@ -35,7 +35,7 @@ xcopy /Y ..\..\source\Cosmos\Cosmos.System\bin\debug\Cosmos.Sys.* . xcopy /Y ..\..\source\Cosmos\Cosmos.Sys.Plugs\bin\Debug\Cosmos.Sys.Plugs.* . xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* . -xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip . +xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject (C#).zip" . REM splitup compiler: xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler\bin\debug\Cosmos.Compiler.Assembler.* . xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler.X86\bin\debug\Cosmos.Compiler.Assembler.X86.* . diff --git a/Setup2/BuildUserKit.bat b/Setup2/BuildUserKit.bat index 7ad076970..ab51fa64f 100644 --- a/Setup2/BuildUserKit.bat +++ b/Setup2/BuildUserKit.bat @@ -35,7 +35,7 @@ xcopy /Y ..\..\source\Cosmos\Cosmos.System\bin\debug\Cosmos.Sys.* . xcopy /Y ..\..\source\Cosmos\Cosmos.Sys.Plugs\bin\Debug\Cosmos.Sys.Plugs.* . xcopy /Y ..\..\source\Cosmos.Kernel.FileSystems\bin\debug\Cosmos.Sys.FileSystem.* . xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\bin\Debug\Cosmos.VS.Package.* . -xcopy /Y ..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject.zip . +xcopy /Y "..\..\source2\VSIP\Cosmos.VS.Package\obj\Debug\CosmosProject (C#).zip" . REM splitup compiler: xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler\bin\debug\Cosmos.Compiler.Assembler.* . xcopy /Y ..\..\source2\Compiler\Cosmos.Compiler.Assembler.X86\bin\debug\Cosmos.Compiler.Assembler.X86.* . diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss index 485f29bcd..9d291eace 100644 --- a/Setup2/Cosmos.iss +++ b/Setup2/Cosmos.iss @@ -141,7 +141,7 @@ Source: .\source\Cosmos\Cosmos.Kernel\bin\Debug\Cosmos.Kernel.*; DestDir: {app}\ Source: .\source\Cosmos\Cosmos.System\bin\Debug\Cosmos.Hardware.*; DestDir: {app}\Kernel; Flags: ignoreversion uninsremovereadonly Source: .\source\Cosmos\Cosmos.System\bin\Debug\Cosmos.Sys.*; DestDir: {app}\Kernel; Flags: ignoreversion uninsremovereadonly Source: .\source\Cosmos\Cosmos.System\bin\Debug\Cosmos.Sys.FileSystem.*; DestDir: {app}\Kernel; Flags: ignoreversion uninsremovereadonly -Source: .\Build\VSIP\CosmosProject.zip; DestDir: {code:VSNET2008_PATH|}\ProjectTemplates\Cosmos; Flags: ignoreversion uninsremovereadonly +Source: ".\Build\VSIP\CosmosProject (C#).zip"; DestDir: {code:VSNET2008_PATH|}\ProjectTemplates\Cosmos; Flags: ignoreversion uninsremovereadonly Source: .\source\Cosmos.ico; DestDir: {app}; Flags: ignoreversion uninsremovereadonly Source: .\Build\ISO\isolinux.*; DestDir: {app}\Build\ISO diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.targets b/source2/Build/Cosmos.Build.MSBuild/Cosmos.targets index 9d4907e85..9abbd4825 100644 --- a/source2/Build/Cosmos.Build.MSBuild/Cosmos.targets +++ b/source2/Build/Cosmos.Build.MSBuild/Cosmos.targets @@ -36,7 +36,7 @@ References="@(ReferencePath)" OutputDir="$(TargetDir)" EnableLogging="true" - EmitDebugSymbols="true"> + EmitDebugSymbols="$(DebugSymbols)"> diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj index 78e66ca3c..ce5c3d542 100644 --- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj +++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj @@ -35,6 +35,26 @@ 4 false + + true + bin\Debug\ + DEBUG;TRACE + full + x86 + true + GlobalSuppressions.cs + prompt + + + bin\Release\ + TRACE + true + pdbonly + x86 + true + GlobalSuppressions.cs + prompt + False @@ -148,6 +168,36 @@ + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + + + Templates\Projects\CosmosProject %28C#%29 + BuildPage.cs @@ -179,12 +229,6 @@ VMPage.cs - - - - - - @@ -250,26 +294,6 @@ true ..\MPF\9.0\Src\CSharp - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - true - GlobalSuppressions.cs - prompt - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - true - GlobalSuppressions.cs - prompt - diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CosmosProject.vstemplate b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CosmosProject.vstemplate new file mode 100644 index 000000000..954ebff23 --- /dev/null +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/CosmosProject.vstemplate @@ -0,0 +1,24 @@ + + + Cosmos Project + A project for creating a Cosmos Kernel + Kernel.ico + Cosmos + 50 + + + + + Proj\CosmosProj.vstemplate + + + ProjKernel\CSharpProj.vstemplate + + + + + + + + + diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.ico b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.ico similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.ico rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Kernel.ico diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProj.vstemplate b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProj.vstemplate new file mode 100644 index 000000000..48fd0c613 --- /dev/null +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProj.vstemplate @@ -0,0 +1,17 @@ + + + Proj + A project for creating a Cosmos Kernel + Kernel.ico + Cosmos + + + + + + diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProject.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProject.Cosmos new file mode 100644 index 000000000..847708c9b --- /dev/null +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProject.Cosmos @@ -0,0 +1,45 @@ + + + Debug + 2.0 + $guid1$ + false + $safeprojectname$ + elf + + + true + bin\Debug\ + MicrosoftNET + False + False + Source + User + VMWare + Player + false + + + + true + bin\Release\ + MicrosoftNET + False + False + Source + User + VMWare + Player + false + + + + $safeprojectname$Kernel + $guid2$ + True + + + + + + \ No newline at end of file diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.ico b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/Kernel.ico similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.ico rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/Kernel.ico diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/AssemblyInfo.cs b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/AssemblyInfo.cs similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/AssemblyInfo.cs rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/AssemblyInfo.cs diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProj.vstemplate b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProj.vstemplate new file mode 100644 index 000000000..4ff5ac080 --- /dev/null +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProj.vstemplate @@ -0,0 +1,19 @@ + + + ProjKernel + A project for creating a Cosmos Kernel + Kernel.ico + CSharp + + + + + AssemblyInfo.cs + Kernel.cs + + + \ No newline at end of file diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProject.csproj b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProject.csproj new file mode 100644 index 000000000..647652f33 --- /dev/null +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/CSharpProject.csproj @@ -0,0 +1,55 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + $guid2$ + Library + Properties + $kernelname$Kernel + $kernelname$Kernel + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.cs b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.cs similarity index 74% rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.cs rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.cs index 4f63e4a9c..7e678a4ea 100644 --- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Program.cs +++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.cs @@ -2,16 +2,11 @@ using System.Collections.Generic; using System.Text; -namespace $nameSpace$ +namespace $safeprojectname$ { - public class $className$ + public class Kernel { - public static void Init() - { - Main(); - } - - static void Main() + public static void Boot() { // Boot the Cosmos kernel: Cosmos.Sys.Boot xBoot = new Cosmos.Sys.Boot(); diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.ico b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.ico new file mode 100644 index 000000000..fcdc40183 Binary files /dev/null and b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/ProjKernel/Kernel.ico differ diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.Cosmos deleted file mode 100644 index 85859792c..000000000 --- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.Cosmos +++ /dev/null @@ -1,52 +0,0 @@ - - - Debug - 2.0 - {99999999-9999-9999-9999-999999999999} - Exe - Cosmos.User.Kernel - CosmosKernel - false - v3.5 - Project2 - CSharp - - - true - bin\Debug\ - MicrosoftNET - False - False - Source - User - VMWare - Player - - - - false - bin\Release\ - MicrosoftNET - False - - - - - - - - - - - - - Code - - - Code - - - - - - \ No newline at end of file diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate deleted file mode 100644 index 145baf108..000000000 --- a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate +++ /dev/null @@ -1,19 +0,0 @@ - - - Cosmos Project - A project for creating a Cosmos Kernel - Kernel.ico - Cosmos - 50 - 1 - true - CosmosProject - true - - - - Program.cs - AssemblyInfo.cs - - -