X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e74a9319f9f0f264b87e733d65111c8489a8bd48..8912d7eb182ef5a5f95026a9ed239c9ad6c75915:/distrib/msw/zipdistinno.bat

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index ed016995a7..62eab13e53 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -3,10 +3,11 @@ rem Zip up an external, generic + Windows distribution of wxWindows 2
 rem using Inno Setup + ScriptMaker
 set src=%wxwin
 set dest=%src\deliver
+set webfiles=c:\wx2dev\wxWebSite
 set inno=0
 
 Rem Set this to the required version
-set version=2.3.0
+set version=2.3.2
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -25,18 +26,31 @@ pause
 
 erase %dest\wx*.zip
 erase %dest\*.htb
-erase %dest\ogl3.zip
-erase %dest\tex2rtf2.zip
-erase %dest\jpeg.zip
-erase %dest\tiff.zip
-erase %dest\dialoged.zip
-erase %dest\utils.zip
-erase %dest\extradoc.zip
-erase %dest\*-win32.zip
+erase %dest\ogl3*.zip
+erase %dest\contrib*.zip
+erase %dest\tex2rtf2*.zip
+erase %dest\mmedia*.zip
+erase %dest\jpeg*.zip
+erase %dest\tiff*.zip
+erase %dest\dialoged*.zip
+erase %dest\utils*.zip
+erase %dest\extradoc*.zip
+erase %dest\stc*.zip
+erase %dest\*-win32*.zip
+erase %dest\setup*.*
+erase %dest\*.txt
+erase %dest\make*
 
 if direxist %dest\wx erase /sxyz %dest\wx\
 if not direxist %dest mkdir %dest
 
+# Copy FAQ from wxWebSite CVS
+if not direxist %webfiles% echo Error - %webfiles% does not exist
+if not direxist %webfiles% goto end
+echo Copying FAQ and other files from %webfiles
+copy %webfiles%\site\faq*.htm %src\docs\html
+copy %webfiles%\site\platform.htm %src\docs\html
+
 cd %src
 echo Zipping...
 
@@ -49,15 +63,29 @@ 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
 
+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\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\contrib.rsp
+zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
+
 Rem Below is the old-style separated-out format. This is retained only
 Rem for local use, and for creating wxMSW-xxx.zip.
+echo Zipping individual components
 zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
 zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
 zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
 zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
+Rem zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
 zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
 zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
 Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp
@@ -72,7 +100,10 @@ zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
-zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
+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
@@ -84,49 +115,53 @@ rem CodeWarrior project files
 zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
 
 rem OGL 3
-zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
+zip32 -@ %dest\ogl3-%version%.zip < %src\distrib\msw\ogl.rsp
 
 rem MMedia
-zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp
+zip32 -@ %dest\mmedia-%version%.zip < %src\distrib\msw\mmedia.rsp
 
 rem STC (Scintilla widget)
-zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
+zip32 -@ %dest\stc-%version%.zip < %src\distrib\msw\stc.rsp
 
 rem GLCanvas: obsolete, now in main library
 rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
 
 rem Tex2RTF
-zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
+zip32 -@ %dest\tex2rtf2-%version%.zip < %src\distrib\msw\tex2rtf.rsp
 
 rem JPEG source
-zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
+zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp
 
 rem TIFF source
-zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
+zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
+
+zip32 -@ %dest\wxxrc-%version%.zip < %src\distrib\msw\xml.rsp
 
-zip32 -@ %dest\wxxml.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.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+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.zip < %src\distrib\msw\utils.rsp
-zip32 -@ -u %dest\utils.zip < %src\distrib\msw\utilmake.rsp
-
-copy %src\docs\changes.txt %dest
-copy %src\docs\msw\install.txt %dest\install_msw.txt
-copy %src\docs\motif\install.txt %dest\install_motif.txt
-copy %src\docs\gtk\install.txt %dest\install_gtk.txt
-copy %src\docs\readme.txt %dest
-copy %src\docs\motif\readme.txt %dest\readme_motif.txt
-copy %src\docs\gtk\readme.txt %dest\readme_gtk.txt
-copy %src\docs\msw\readme.txt %dest\readme_msw.txt
-copy %src\docs\readme_vms.txt %dest
-copy %src\docs\motif\makewxmotif %dest
-copy %src\docs\gtk\makewxgtk %dest
+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\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\makewxmotif %dest\makewxmotif-%version%
+copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
 
 Rem Skip Inno Setup if inno is 0.
 if "%inno" == "0" goto end
@@ -137,8 +172,8 @@ Rem Make dialoged-win32.zip and tex2rtf-win32.zip
 
 cd %src\bin
 
-zip32 %dest\dialoged-win32.zip dialoged.*
-zip32 %dest\tex2rtf-win32.zip tex2rtf.*
+zip32 %dest\dialoged-win32-%version%.zip dialoged.*
+zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
 
 cd %dest
 
@@ -151,17 +186,21 @@ 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
-unzip32 -o ..\extradoc.zip
+unzip32 -o ..\extradoc-%version%.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wxWindows-%version%-Word.zip
-unzip32 -o ..\ogl3.zip
-unzip32 -o ..\jpeg.zip
-unzip32 -o ..\tiff.zip
-unzip32 -o ..\xml.zip
-unzip32 -o ..\tex2rtf2.zip
+unzip32 -o ..\ogl3-%version%.zip
+unzip32 -o ..\mmedia-%version%.zip
+unzip32 -o ..\stc-%version%.zip
+unzip32 -o ..\jpeg-%version%.zip
+unzip32 -o ..\tiff-%version%.zip
+unzip32 -o ..\wxxrc-%version%.zip
+unzip32 -o ..\contrib-%version%.zip
+unzip32 -o ..\tex2rtf2-%version%.zip
 
 rem Now delete a few files that are unnecessary
 attrib -R *
@@ -170,11 +209,11 @@ erase /Y configure samples\configure samples\*.in demos\configure demos\*.in con
 erase /Y setup.h.in setup.h_vms
 erase /SY Makefile.in
 erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
-erase /Y contrib\docs\winhelp\mmedia.*
-erase /Y contrib\docs\winhelp\stc.*
-erase /Y contrib\docs\htmlhelp\mmedia.*
-erase /Y contrib\docs\htmlhelp\stc.*
-erase /Y contrib\docs\pdf\*.*
+Rem erase /Y contrib\docs\winhelp\mmedia.*
+Rem erase /Y contrib\docs\winhelp\stc.*
+Rem erase /Y contrib\docs\htmlhelp\mmedia.*
+Rem erase /Y contrib\docs\htmlhelp\stc.*
+Rem erase /Y contrib\docs\pdf\*.*
 erase /sxzy contrib\docs\latex\ogl
 erase /Y src\mingegcs.bat
 erase /Y distrib
@@ -212,7 +251,7 @@ Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe
 cd %dest
 
 rem Put all the setup files into a single zip archive.
-zip32 wxMSW-%version%-setup.zip readme.txt setup.*
+zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup.*
 
 echo wxWindows archived.