Register multibutton editor class in frame ctor instead of CreateGrid() (this fixes...

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

diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index eb3ed833fafeedb4adba9bec4b575f6e52c3fce6..b892aec1d6876a79c37b02e5d10a5fccb5743e50 100644 (file)
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -2,16 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"
-    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
-    #define SETUPFILENAME  "wxMSW-cvs-Setup"
-    #define WX_VERSION "CVS"
+    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildSVN.txt"
+    #define WX_VERSION "SVN"
 #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"
 
+#define INNODIR "C:\wx\inno\wxWidgets"
 
 [Setup]
 AppName=wxWidgets
@@ -22,18 +22,26 @@ AppSupportURL=http://www.wxwidgets.org
 AppUpdatesURL=http://www.wxwidgets.org
 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
+LicenseFile={#INNODIR}\docs\licence.txt
+InfoBeforeFile={#INNODIR}\docs\readme.txt
 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}
-SetupIconFile=C:\wx\inno\wxWidgets\art\wxwin.ico
+SetupIconFile={#INNODIR}\art\wxwin.ico
 Compression=lzma
 SolidCompression=yes
 
 [Files]
-Source: "C:\wx\inno\wxWidgets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; source files
+Source: "{#INNODIR}\*"; DestDir: "{app}"; Excludes: ".cvsignore,cocoa,dfb,mac,gtk,gtk1,mgl,motif,msdos,os2,palmos,wxWindows.xcod*,x11,contrib,debian,distrib,docs,misc,tests,wxPython,*.pch,*.pch++,*.pchmm"; Flags: ignoreversion recursesubdirs createallsubdirs
+; docs and helpfile
+Source: "{#INNODIR}\docs\htmlhelp\*"; DestDir: "{app}\docs\htmlhelp\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\licence.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\readme.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\changes.txt"; DestDir: "{app}\docs\";  Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [INI]