fix for testing if a property is in allParams - it must be a sequence

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

diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index cac662c0d2cb0d33cdc84be7a792ef86a10b5851..72882c903349c869f413b24a57b5928cacb6e698 100644 (file)
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -3,14 +3,14 @@
 
 #if GetEnv("WXW_VER") == "CVS"
     #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.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
 
+#define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
+
 
 
 [Setup]
@@ -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
@@ -42,6 +43,10 @@ Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http
 [Icons]
 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]