From 69f9caa288fb2414e6418c739861121a089e3b6f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 16 Apr 2004 08:36:09 +0000 Subject: [PATCH] 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 | 30 +++++++++++++++++++++++++-- distrib/msw/innobott.txt | 1 + distrib/msw/innotop.txt | 10 ++++----- distrib/msw/makefile.rsp | 3 +++ distrib/msw/os2.rsp | 1 + distrib/msw/setup.var | 2 +- distrib/msw/tex2rtf.rsp | 1 + distrib/msw/utils.rsp | 45 +++------------------------------------- 8 files changed, 43 insertions(+), 50 deletions(-) diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 5fbfb79d0f..d2cd32be06 100644 --- a/distrib/msw/generic.rsp +++ b/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/mbconv/*.bkl +tests/*.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 + diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt index a2b1f698cc..db6c775b86 100644 --- a/distrib/msw/innobott.txt +++ b/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] diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt index 7e295b7c75..d32b3a8b0e 100644 --- a/distrib/msw/innotop.txt +++ b/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 - DiskClusterSize=512 +; DiskSize=1457664 +; DiskClusterSize=512 ReserveBytes=0 UseSetupLdr=1 SourceDir=%SOURCEDIR% diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index 90b1489db6..b9ecf9fccb 100644 --- a/distrib/msw/makefile.rsp +++ b/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 + diff --git a/distrib/msw/os2.rsp b/distrib/msw/os2.rsp index d93a22878e..2ab8929090 100644 --- a/distrib/msw/os2.rsp +++ b/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 diff --git a/distrib/msw/setup.var b/distrib/msw/setup.var index 33e4642687..1df8776efb 100644 --- a/distrib/msw/setup.var +++ b/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). diff --git a/distrib/msw/tex2rtf.rsp b/distrib/msw/tex2rtf.rsp index 3cfd568af1..61b307ea32 100644 --- a/distrib/msw/tex2rtf.rsp +++ b/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 diff --git a/distrib/msw/utils.rsp b/distrib/msw/utils.rsp index 1718958792..58b09afb14 100644 --- a/distrib/msw/utils.rsp +++ b/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 -- 2.45.2