From 58aba4a28a15a7a6a814804d90ce57cf3f4ca1ab Mon Sep 17 00:00:00 2001 From: Justin Dearing Date: Fri, 15 Jun 2007 12:51:31 +0000 Subject: [PATCH] Fixed projects now call Console.ReadKey(true). Updated AssemblyInfo for boo projects to reflect changes in VB and C#. Wix Project template now uses included dialog files. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2553 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../project/CSharp/ConsoleProject.xpt | 2 +- .../project/VBNet/ConsoleProject.xpt | 2 +- .../Project/Templates/ConsoleProject.xpt | 6 + .../Project/Templates/DefaultAssemblyInfo.boo | 30 +- .../Templates/DefaultVerifyReadyDialog.wxs | 38 ++ .../DefaultViewLicenseAgreementDialog.wxs | 39 ++ .../Project/Templates/WixProject.xpt | 431 +----------------- .../WixBinding/Project/WixBinding.csproj | 42 ++ src/Setup/Files.wxs | 18 +- src/Setup/Setup.wxs | 1 + 10 files changed, 175 insertions(+), 434 deletions(-) create mode 100644 src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultVerifyReadyDialog.wxs create mode 100644 src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultViewLicenseAgreementDialog.wxs diff --git a/data/templates/project/CSharp/ConsoleProject.xpt b/data/templates/project/CSharp/ConsoleProject.xpt index a1a6493d89..9ba80da4b3 100644 --- a/data/templates/project/CSharp/ConsoleProject.xpt +++ b/data/templates/project/CSharp/ConsoleProject.xpt @@ -37,7 +37,7 @@ namespace ${StandardNamespace} // TODO: Implement Functionality Here Console.Write("Press any key to continue . . . "); - Console.ReadKey(); + Console.ReadKey(true); } } }]]> diff --git a/data/templates/project/VBNet/ConsoleProject.xpt b/data/templates/project/VBNet/ConsoleProject.xpt index f3100fc5de..d1e1de4a17 100644 --- a/data/templates/project/VBNet/ConsoleProject.xpt +++ b/data/templates/project/VBNet/ConsoleProject.xpt @@ -47,7 +47,7 @@ Module Program ' TODO: Implement Functionality Here Console.Write("Press any key to continue . . . ") - Console.ReadKey() + Console.ReadKey(True) End Sub End Module ]]> diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/ConsoleProject.xpt b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/ConsoleProject.xpt index be398ef608..7f268f981b 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/ConsoleProject.xpt +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/ConsoleProject.xpt @@ -31,7 +31,13 @@ import System import System.Collections print "Hello, World!" + +// TODO: Implement Functionality Here + +print "Press any key to continue . . . " +Console.ReadKey(true) ]]> + diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/DefaultAssemblyInfo.boo b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/DefaultAssemblyInfo.boo index 0f9e27ce77..61ad97f0cc 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/DefaultAssemblyInfo.boo +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Templates/DefaultAssemblyInfo.boo @@ -1,20 +1,22 @@ import System.Reflection import System.Runtime.CompilerServices +import System.Runtime.InteropServices -// Information about this assembly is defined by the following -// attributes. -// -// change them to the information which is associated with the assembly -// you compile. +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("${ProjectName}")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("${ProjectName}")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] -[assembly: AssemblyTitle('')] -[assembly: AssemblyDescription('')] -[assembly: AssemblyConfiguration('')] -[assembly: AssemblyCompany('')] -[assembly: AssemblyProduct('')] -[assembly: AssemblyCopyright('')] -[assembly: AssemblyTrademark('')] -[assembly: AssemblyCulture('')] +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] // The assembly version has following format : // @@ -23,4 +25,4 @@ import System.Runtime.CompilerServices // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.*")] diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultVerifyReadyDialog.wxs b/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultVerifyReadyDialog.wxs new file mode 100644 index 0000000000..2f8c34527d --- /dev/null +++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultVerifyReadyDialog.wxs @@ -0,0 +1,38 @@ + + + + + + + OutOfDiskSpace <> 1 + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST) + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" + (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") + + + 1 + + + + + + + + Click Install to begin the installation. If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard. + + + + + The [Wizard] is ready to begin the [InstallMode] installation + + + [TitleFont]Ready to Install + + + + + + diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultViewLicenseAgreementDialog.wxs b/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultViewLicenseAgreementDialog.wxs new file mode 100644 index 0000000000..75ce3c3e83 --- /dev/null +++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/DefaultViewLicenseAgreementDialog.wxs @@ -0,0 +1,39 @@ + + + + + + + + + + + + + 1 + + + AcceptLicense = "Yes" + AcceptLicense <> "Yes" + AcceptLicense = "Yes" + + + 1 + + + + + + + + + Please read the following license agreement carefully! + + + [TitleFont]End-User License Agreement + + + + + + diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixProject.xpt b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixProject.xpt index b1a47a3605..1d3b74305e 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixProject.xpt +++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixProject.xpt @@ -94,423 +94,20 @@ ]]> - - - - - - - 1 - - - 1 - - - 1 - - - - 1 - 1 - - - To install in this folder, click "Next". To install to a different folder, enter it below or click "Browse". - - - - - - This is the folder where [ProductName] will be installed. - - - [TitleFont]Select Installation Folder - - - - - - -]]> - - - - - - - OutOfDiskSpace <> 1 - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST) - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") - - - 1 - - - - - - - - Click Install to begin the installation. If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard. - - - - - The [Wizard] is ready to begin the [InstallMode] installation - - - [TitleFont]Ready to Install - - - - - -]]> - - - - - - - - - - - - - 1 - - - AcceptLicense = "Yes" - AcceptLicense <> "Yes" - AcceptLicense = "Yes" - - - 1 - - - - - - - - - Please read the following license agreement carefully! - - - [TitleFont]End-User License Agreement - - - - - -]]> - - - - - - - 1 - - - 1 - - - - - - The installer will guide you through the steps required to install [ProductName] on your computer. - - - [BigFont]Welcome to the [ProductName] installation - - - - - -]]> - - - - - - - 1 - - - - - - Please wait while [ProductName] is installed. - - - - - Install [ProductName] - - - - - - - - - - - - -]]> - - - - - - - Are you sure you want to cancel [ProductName] installation? - - - 1 - - - 1 - - - - - - -]]> - - - - - - - - 1 - - - 1 - 1 - - - - - - - 1 - - - 1 - - - - - - - - Browse to the destination folder - - - [TitleFont]Change current destination folder - - - - - -]]> - - - - - - - 1 - - - - - - - [BigFont][ProductName] installation was interrupted - - - The installation was interrupted before [ProductName] could be installed. You need to restart the installer to try again. - - - Click the Finish button to exit. - - - - - -]]> - - - - - - - 1 - - - - - - - Click the Finish button to exit. - - - [BigFont]Completing the [ProductName] installation. - - - - - -]]> - - - - - - - 1 - - - - The highlighted volumes do not have enough disk space available for the currently selected features. You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s). - - - - - Disk space required for the installation exceeds available disk space. - - - [TitleFont]Out of Disk Space - - - {120}{70}{70}{70}{70} - - - - - -]]> - - - - - - - 1 - - - 1 - 1 - - - - The highlighted volumes do not have enough disk space available for the currently selected features. You can either remove some files from the highlighted volumes, or choose to install less features onto local drive(s), or select different destination drive(s). - - - - - Disk space required for the installation exceeds available disk space. - - - [TitleFont]Out of Disk Space - - - {120}{70}{70}{70}{70} - - - Alternatively, you may choose to disable the installer"s rollback functionality. This allows the installer to restore your computer"s original state should the installation be interrupted in any way. Click Yes if you wish to take the risk to disable rollback. - - - - - -]]> - - - - - - - 1 - - - - - - - [BigFont][ProductName] ended prematurely - - - [ProductName] setup ended prematurely because of an error. Your system has not been modified. To install this program at a later time, please run the installation again. - - - Click the Finish button to exit the. - - - - - -]]> - - - - - - {&DlgFontBold8} - {&VerdanaBold13} - DlgFont8 - - - - - - - - INSTALLDIR="" - - - - - - - - - - - - INSTALLDIR="" - - - - - - - - - - - - - - - - - - -]]> - + + + + + + + + + + + + + + diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj index c334aaae32..b9f265de0e 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj +++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj @@ -150,6 +150,48 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 5106bb1d11..194b08d7b9 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -934,6 +934,22 @@ + + + + + + + + + + + + + + + + @@ -1156,7 +1172,7 @@