Updates for Inno Setup 4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/generic.rsp

@@ -164,6 +164,7 @@ utils/hhp2cached/*.cpp
 utils/hhp2cached/*.def
 utils/hhp2cached/*.rc
 utils/hhp2cached/makefile*
+utils/hhp2cached/*.bkl
 utils/hhp2cached/*.xbm
 utils/hhp2cached/*.xpm
 utils/hhp2cached/*.txt
@@ -1370,10 +1371,35 @@ demos/dbbrowse/help.std/*.hhp
 demos/dbbrowse/help.std/*.hhk
 demos/dbbrowse/*.bkl
 
-tests/mbconv/*.cpp
+tests/*.bkl
-tests/mbconv/*.bkl
+tests/makefile*.*
+tests/test.dsp
+tests/test.dsw
+tests/*.cpp
+
+tests/filesys/*.cpp
+tests/filesys/*.h
+tests/filesys/*.bkl
+tests/filesys/*.inc
 
 tests/formatconverter/*.pl
 tests/formatconverter/*.cpp
 tests/formatconverter/*.txt
 
+tests/mbconv/*.cpp
+tests/mbconv/*.h
+tests/mbconv/*.bkl
+tests/mbconv/*.inc
+
+tests/regex/*.cpp
+tests/regex/*.h
+tests/regex/*.bkl
+tests/regex/*.inc
+tests/regex/*.pl
+tests/regex/*.test
+
+tests/streams/*.cpp
+tests/streams/*.h
+tests/streams/*.bkl
+tests/streams/*.inc
+

distrib/msw/innobott.txt

@@ -9,6 +9,7 @@
 ;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
+    Name: "{group}\Uninstall wxWindows %VERSION%"; Filename: "{uninstallexe}"
 
 [INI]
 

distrib/msw/innotop.txt

@@ -25,9 +25,9 @@
     DisableStartupPrompt=0
     CreateAppDir=1
     DisableProgramGroupPage=0
-    AlwaysCreateUninstallIcon=1
+;    AlwaysCreateUninstallIcon=1
     Uninstallable=1
-    UninstallIconName=Uninstall %APPTITLE% %VERSION%
+;    UninstallIconName=Uninstall %APPTITLE% %VERSION%
     UninstallDisplayName=%APPTITLE% %VERSION%
     UninstallLogMode=Append
     DefaultDirName=c:\%APPTITLE%-%VERSION%
@@ -35,10 +35,10 @@
     LicenseFile=%LICENSEFILE%
     InfoBeforeFile=%READMEFILE%
     InfoAfterFile=%READMEAFTERFILE%
-    MessagesFile=compiler:default.isl
+;    MessagesFile=compiler:default.isl
     DiskSpanning=1
-    DiskSize=1457664
+;    DiskSize=1457664
-    DiskClusterSize=512
+;    DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
     SourceDir=%SOURCEDIR%

distrib/msw/makefile.rsp

@@ -1,6 +1,7 @@
 Makefile.in
 src/regex/Makefile.in
 locale/Makefile
+tests/Makefile.in
 samples/Makefile.in
 samples/access/Makefile.in
 samples/artprov/Makefile.in
@@ -63,6 +64,7 @@ samples/sound/Makefile.in
 samples/sockets/Makefile.in
 samples/splitter/Makefile.in
 samples/statbar/Makefile.in
+samples/taskbar/Makefile.in
 samples/text/Makefile.in
 samples/thread/Makefile.in
 samples/toolbar/Makefile.in
@@ -180,3 +182,4 @@ src/zlib/descrip.mms
 src/regex/descrip.mms
 utils/helpview/src/descrip.mms
 utils/tex2rtf/src/descrip.mms
+

distrib/msw/os2.rsp

@@ -21,6 +21,7 @@ src/os2/*.c
 src/os2/makefile.va
 src/os2/*.def
 src/os2/*.lst
+src/os2/*.sh
 
 include/wx/os2/*.h
 include/wx/os2/*.rc

distrib/msw/setup.var

@@ -93,7 +93,7 @@ APPBINARY=$APPDIR/src/ReleaseStable/$APPNAME.exe
 # The location of the setup compiler
 #-------------------------------------------------------------------------
 
-SETUPCOMPILER="c:/Program Files/Inno Setup 2/compil32.exe"
+SETUPCOMPILER="c:/Program Files/Inno Setup 4/compil32.exe"
 
 #-------------------------------------------------------------------------
 # Whether we will compress the binary (0 or 1).

distrib/msw/tex2rtf.rsp

@@ -11,6 +11,7 @@ utils/tex2rtf/src/makefile.vms
 utils/tex2rtf/src/makefile.g95
 utils/tex2rtf/src/makengui.nt
 utils/tex2rtf/src/Makefile.in
+utils/tex2rtf/src/*.bkl
 utils/tex2rtf/src/*.dsp
 utils/tex2rtf/src/*.dsw
 utils/tex2rtf/src/*.xbm

distrib/msw/utils.rsp

@@ -1,50 +1,9 @@
-utils/wxgraph/src/*.cpp
-utils/wxgraph/src/*.c
-utils/wxgraph/src/*.h
-utils/wxgraph/src/makefile*
-utils/wxgraph/src/*.xbm
-utils/wxgraph/src/*.xpm
-utils/wxgraph/lib/dummy
-utils/wxgraph/src/*.ico
-utils/wxgraph/src/*.def
-utils/wxgraph/src/*.rc
-
-utils/rcparser/src/*.cpp
-utils/rcparser/src/*.c
-utils/rcparser/src/*.h
-utils/rcparser/src/makefile*
-utils/rcparser/src/*.xbm
-utils/rcparser/src/*.xpm
-utils/rcparser/lib/dummy
-utils/rcparser/src/*.ico
-utils/rcparser/src/*.def
-utils/rcparser/src/*.rc
-utils/rcparser/src/*.rh
-
-utils/serialize/*.h
-utils/serialize/*.cpp
-utils/serialize/*.def
-utils/serialize/*.rc
-utils/serialize/makefile*
-utils/serialize/*.xbm
-utils/serialize/*.xpm
-utils/serialize/*.txt
-
-utils/makegen/*.h
-utils/makegen/*.cpp
-utils/makegen/*.def
-utils/makegen/*.rc
-utils/makegen/makefile*
-utils/makegen/*.xbm
-utils/makegen/*.xpm
-utils/makegen/*.txt
-utils/makegen/templates/make*
-
 utils/HelpGen/src/*.h
 utils/HelpGen/src/*.cpp
 utils/HelpGen/src/*.def
 utils/HelpGen/src/*.rc
 utils/HelpGen/src/makefile*
+utils/HelpGen/src/*.bkl
 utils/HelpGen/src/*.xbm
 utils/HelpGen/src/*.xpm
 utils/HelpGen/src/*.txt
@@ -60,6 +19,7 @@ utils/emulator/src/makefile.wat
 utils/emulator/src/makefile.unx
 utils/emulator/src/makefile.vms
 utils/emulator/src/makefile.g95
+utils/emulator/src/*.bkl
 utils/emulator/src/*.xbm
 utils/emulator/src/*.xpm
 utils/emulator/src/*.sty
@@ -85,6 +45,7 @@ utils/helpview/src/*.txt
 utils/helpview/src/*.htb
 utils/helpview/src/*.ico
 utils/helpview/src/*.xml
+utils/helpview/src/*.bkl
 utils/helpview/src/test.zip
 utils/helpview/src/bitmaps/*.xpm