From 2eef6185378ec8d56de025482dc0292b27bb6066 Mon Sep 17 00:00:00 2001 From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498> Date: Wed, 13 Jun 2012 03:52:31 +0000 Subject: [PATCH] Template change --- Setup2/Cosmos.iss | 13 +++++++++---- Setup2/ReadMe.txt | 2 +- .../Build/Cosmos.Build.Builder/CosmosTask.cs | 1 + .../Template/XSharpFileItem.zip | Bin 4066 -> 4070 bytes 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss index c1ecf78f9..c2c4ca3ba 100644 --- a/Setup2/Cosmos.iss +++ b/Setup2/Cosmos.iss @@ -186,10 +186,15 @@ Source: ".\Build\ISO\isolinux.*"; DestDir: "{app}\Build\ISO" Source: ".\Build\ISO\mboot.c32"; DestDir: "{app}\Build\ISO" ; Templates +; Templates use the user dir and not global. Global requires devenve /setup (items) or /installvstemplates (project) which is VERY slow and kills during devkit + ; Install files into VS Integrated Shell (which includes full Visual Studio) -Source: ".\Build\VSIP\CosmosProject (C#).zip"; DestDir: "{code:VSNET2010_PATH}\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Csharp2010_Installed('dummy') -Source: ".\Build\VSIP\CosmosProject (F#).zip"; DestDir: "{code:VSNET2010_PATH}\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Fsharp2010_Installed('dummy') -Source: ".\Build\VSIP\CosmosProject (VB).zip"; DestDir: "{code:VSNET2010_PATH}\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Vb2010_Installed('dummy') +Source: ".\Build\VSIP\CosmosProject (C#).zip"; DestDir: "{userdocs}\Visual Studio 2010\Templates\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Csharp2010_Installed('dummy') +Source: ".\Build\VSIP\CosmosProject (F#).zip"; DestDir: "{userdocs}\Visual Studio 2010\Templates\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Fsharp2010_Installed('dummy') +Source: ".\Build\VSIP\CosmosProject (VB).zip"; DestDir: "{userdocs}\Visual Studio 2010\Templates\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: Vb2010_Installed('dummy') +; X# File Item Template +Source: ".\Build\VSIP\XSharpFileItem.zip"; DestDir: "{userdocs}\Visual Studio 2010\Templates\ItemTemplates\Visual C#\Cosmos"; DestName: "XSharpFileItem.zip"; Flags: ignoreversion uninsremovereadonly; Check: Csharp2010_Installed('dummy') + ; Install templates into Shell Source: ".\Build\VSIP\Cosmos.zip"; DestDir: "{code:VSNET2010_PATH}\ProjectTemplates\Cosmos"; Flags: ignoreversion uninsremovereadonly; Check: IsCSharpExpress2010Installed('dummy') or IsVBExpress2010Installed('dummy') ; Install templates into C# Express @@ -342,7 +347,7 @@ Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet ""{app}\B ; Forces VS to merge the resource metadata that describes menus, toolbars, and command groups from all VSPackages available. #if BuildConfiguration == "Devkit" - ; /setup without nosetupvstemplates takes a LONG time... so we dont run it every time.. for DevKit users, they will need to run it one time first as user kit + ; /setup without nosetupvstemplates takes a LONG time... so we dont run it every time.. for DevKit users, they will need to run it one time first as user kit - see new note above in X# template Filename: {code:VSNET2010_PATH}\devenv.exe; Parameters: /setup /nosetupvstemplates; Flags: waituntilterminated #else Filename: {code:VSNET2010_PATH}\devenv.exe; Parameters: /setup; Flags: waituntilterminated diff --git a/Setup2/ReadMe.txt b/Setup2/ReadMe.txt index 5bdffa0a2..bc56bfab3 100644 --- a/Setup2/ReadMe.txt +++ b/Setup2/ReadMe.txt @@ -1 +1 @@ -Copyright © 2007-2010 The Cosmos Project \ No newline at end of file +Copyright © 2007-2012 The Cosmos Project \ No newline at end of file diff --git a/source2/Build/Cosmos.Build.Builder/CosmosTask.cs b/source2/Build/Cosmos.Build.Builder/CosmosTask.cs index 6c8ef0948..1857f01fa 100644 --- a/source2/Build/Cosmos.Build.Builder/CosmosTask.cs +++ b/source2/Build/Cosmos.Build.Builder/CosmosTask.cs @@ -36,6 +36,7 @@ namespace Cosmos.Build.Builder { Copy("Cosmos.zip"); Copy("CosmosProject (VB).zip"); Copy("CosmosKernel (VB).zip"); + Copy(mCosmosPath + @"\source2\VSIP\Cosmos.VS.XSharp\Template\XSharpFileItem.zip"); Section("Creating Setup"); if (!File.Exists(Paths.ProgFiles32 + @"\Inno Setup 5\ISCC.exe")) { diff --git a/source2/VSIP/Cosmos.VS.XSharp/Template/XSharpFileItem.zip b/source2/VSIP/Cosmos.VS.XSharp/Template/XSharpFileItem.zip index 695783b29ecd92dfd0d5c4a64cc07b8760d12ebf..c2c94ebf26511b3a4a0f55efd91729ce9e32a6f4 100644 GIT binary patch delta 480 zcmaDP|4e>@6ekA*1A|jeVqW$}r6e9%wLNDX_P5j#1DIn0$vPnNe=C1FtqC>s! zY07v1a#LMUEs;AzBWHnMytk%-QvI4sY2{iWZdbg2a=wX8b6d4dLe+fdw%@nng1v4X zzbIGF6yVLsB+tMF3=d$4OgiHrA7a`m31ovX2ZIVon1PW&0ZcUoxNq2N*z5N)z;A(#&EW@Q7} O%M64+f%J7g5Dx%oHlJ4j delta 457 zcmaDR|44p<6bCy414Bq^amhyIBp%s~o6k5L&)TD+&cwi=#mc}S3Y7G%3`xx`$Vn`j zyog6rXxsW@KGU}N$=p20_3LY?-UN||$#;2@8O0_$@@g~kP0r=jkUoFXe_7e-=0>0L z6=$}zm1y_=QwLaYmCj@XE!?PpFJ87wLcOX(RFGn4Ywu*E!i)eTj-L3Nx-v zZP( zS~hF5YUPZ3TYvHBeLZ>a!enheD@NAIX?!a6*BAJ1ojv!}@;1kXy*{_+N9_|Ayi($K zYWt#n0h}-7+@#gGq*q+N9>mpiLVop@n{&CQ@_+TKW2&AybK)vpx0Al>-tOAAeafV7 zxm%9M2Y53w$un>PLxX`KV$vB0`4H1iNgx}9*%?$o!VHWI3Sb%%oO%_LdHDSq?Iy?Y zOKM{VE3%d<9^^n?z%QW}Q2il}$MY