Script mods

[wxWidgets.git] / distrib / msw / zipdistinno.bat

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 32a65a499b615bea841d61fda9df4ee452223741..8eb74cc88c255746ef26adeeb25316cac49f585c 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
 set inno=0
 
 Rem Set this to the required version
-set version=2.3.2
+set version=2.3.3
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -63,16 +63,34 @@ Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
 Rem zip32 -@ -u %dest\wxMSW-%version%.zip  < %src\distrib\msw\jpeg.rsp
 Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
 
+Rem Zip up the complete wxOS2-xxx.zip file
+zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\wx_chm.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
+
 echo Zipping wxMac distribution
 zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
+zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
 
@@ -102,6 +120,9 @@ Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
 zip32 -@ %dest\extradoc-%version%.zip < %src\distrib\msw\extradoc.rsp
 
+Rem zip up Univ-specific files
+zip32 -@ %dest\wxWindows-%version%-univ.zip < %src\distrib\msw\univ.rsp
+
 rem VC++ project files
 zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
 
@@ -137,26 +158,27 @@ zip32 -@ %dest\wxxrc-%version%.zip < %src\distrib\msw\xml.rsp
 zip32 -@ %dest\contrib-%version%.zip < %src\distrib\msw\contrib.rsp
 
 rem Dialog Editor source and binary
-erase %dest\dialoged_source.zip
-zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
-zip32 -j %dest\dialoged-%version%.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
-erase %dest\dialoged_source.zip
+erase %dest\dialoged-source.zip
+zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
+zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+erase %dest\dialoged-source.zip
 
 rem Misc. utils not in the main distribution
 zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
 zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp
 
 copy %src\docs\changes.txt %dest\changes-%version%.txt
-copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
-copy %src\docs\mac\install.txt %dest\install_mac-%version%.txt
-copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
-copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
+copy %src\docs\msw\install.txt %dest\install-msw-%version%.txt
+copy %src\docs\mac\install.txt %dest\install-mac-%version%.txt
+copy %src\docs\motif\install.txt %dest\install-motif-%version%.txt
+copy %src\docs\gtk\install.txt %dest\install-gtk-%version%.txt
 copy %src\docs\readme.txt %dest\readme-%version%.txt
-copy %src\docs\motif\readme.txt %dest\readme_motif-%version%.txt
-copy %src\docs\gtk\readme.txt %dest\readme_gtk-%version%.txt
-copy %src\docs\msw\readme.txt %dest\readme_msw-%version%.txt
-copy %src\docs\mac\readme.txt %dest\readme_mac-%version%.txt
-copy %src\docs\readme_vms.txt %dest\readme_vms-%version%.txt
+copy %src\docs\motif\readme.txt %dest\readme-motif-%version%.txt
+copy %src\docs\gtk\readme.txt %dest\readme-gtk-%version%.txt
+copy %src\docs\msw\readme.txt %dest\readme-msw-%version%.txt
+copy %src\docs\mac\readme.txt %dest\readme-mac-%version%.txt
+copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt
+copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
 copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
 copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
 
@@ -183,6 +205,7 @@ Rem the source wxWindows directory.
 cd %dest\wx
 unzip32 -o ..\wxWindows-%version%-msw.zip
 unzip32 -o ..\wxWindows-%version%-gen.zip
+unzip32 -o ..\wxWindows-%version%-univ.zip
 unzip32 -o ..\wxWindows-%version%-vc.zip
 unzip32 -o ..\wxWindows-%version%-bc.zip
 unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
@@ -219,10 +242,13 @@ if not isdir bin mkdir bin
 copy %src\bin\dialoged.exe bin
 copy %src\bin\tex2rtf.exe bin
 copy %src\bin\dbgview.* bin
+copy %src\bin\widgets.exe bin
+copy %src\bin\widgets.exe.manifest bin
 copy %src\bin\life.exe bin
+copy %src\bin\life.exe.manifest bin
 copy %src\demos\life\breeder.lif bin
-copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
-copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
+copy %src\docs\htmlhelp\dialoged.chm bin
+copy %src\docs\htmlhelp\tex2rtf.chm bin
 
 Rem Make wxMSW-xxx.zip
 zip32 -r ..\wxMSW-%version%.zip *
@@ -237,7 +263,7 @@ call %WXWIN\distrib\msw\makeinno.bat
 erase /Y %dest\setup.*
 
 rem Now invoke Inno Setup on the new wxwin2.iss
-set innocmd="C:\Program Files\Inno Setup 1.3\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
+set innocmd="C:\Program Files\Inno Setup 2\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss
 echo Invoking %innocmd...
 start "Inno Setup" /w %innocmd%
 pause Press any key to continue with the wxWindows distribution...