add overloads of wxString and wxCStrData::operator[] taking long, for consistency...

[wxWidgets.git] / build / script / wxwidgets.iss

diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index 397b4f5649cd698291ee2de0b6d96410a00d2541..7dd6a5f8dea033fd5ef068414771bfb4bb22a049 100644 (file)
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -1,14 +1,14 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#if GetEnv("WXW_VER") != ""
+#if GetEnv("WXW_VER") == "CVS"
     #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
-    #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
-    #define WX_VERSION GetENV("WXW_VER")
-#else
-    #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
     #define SETUPFILENAME  "wxMSW-cvs-Setup"
     #define WX_VERSION "CVS"
+#else
+    #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
+    #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
+    #define WX_VERSION GetENV("WXW_VER")
 #endif
 
 
@@ -20,8 +20,9 @@ AppPublisher=wxWidgets
 AppPublisherURL=http://www.wxwidgets.org
 AppSupportURL=http://www.wxwidgets.org
 AppUpdatesURL=http://www.wxwidgets.org
-DefaultDirName={sd}\wxWidgets
-DefaultGroupName=wxWidgets
+DefaultDirName={sd}\wxWidgets-{#WX_VERSION}
+DefaultGroupName=wxWidgets {#WX_VERSION}
+UsePreviousAppDir=no
 DisableProgramGroupPage=yes
 LicenseFile=C:\wx\inno\wxWidgets\docs\licence.txt
 InfoBeforeFile=C:\wx\inno\wxWidgets\docs\readme.txt
@@ -40,7 +41,12 @@ Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Flags: ignoreversion recurse
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
 
 [Icons]
-Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION} }"; Filename: "{app}\wx.url"
+Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets {#WX_VERSION}}"; Filename: "{app}\wx.url"
+Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}"
 
 
 [UninstallDelete]