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.4.0
if "%src" == "" goto usage
if "%dest" == "" goto usage
erase %dest\wx*.zip
erase %dest\*.htb
-erase %dest\ogl3.zip
-erase %dest\contrib.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
-
-cd %src
+if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+
+Rem 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
+copy %webfiles%\site\i18n.htm %src\docs\html
+
+Rem Copy setup0.h files to setup.h
+copy %src%\include\wx\os2\setup0.h %src%\include\wx\os2\setup.h
+copy %src%\include\wx\msw\setup0.h %src%\include\wx\msw\setup.h
+copy %src%\include\wx\univ\setup0.h %src%\include\wx\univ\setup.h
+
+cd %src%
echo Zipping...
-Rem Zip up the complete wxMSW-xxx.zip file
-Rem NO, do it by unarchiving component files, deleting/copying some files, then
-Rem rearchiving.
-Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp
-Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp
-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 Below is the old-style separated-out format. This is retained only
-Rem for local use, and for creating wxMSW-xxx.zip.
-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
-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
-
+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\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\deprecated.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
+
+Rem Rearchive under wxWindows-%version%
+if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+
+mkdir %dest%\wxWindows-%version%
+cd %dest%\wxWindows-%version%
+unzip32 ..\wxOS2-%version%.zip
+echo Overwriting with OS2-specific versions of configure files...
+unzip32 -o %src%\distrib\os2\os2-specific.zip
+erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
+erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
+erase /SXY docs\html\dialoged docs\html\tex2rtf
+
+echo Making files lower case...
+cd src\os2
+call %src%\distrib\msw\lower.bat
+cd ..\..\include\wx\os2
+call %src%\distrib\msw\lower.bat
+
+cd %dest%
+
+erase wxOS2-%version%.zip
+zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
+
+cd %src%
+
+echo Zipping wxMac distribution
+
+copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
+
+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_mac.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\deprecated.rsp
+zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
+
+zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
+
+erase /Y %src%\include\wx\setup.h
+
+if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+
+mkdir %dest%\wxWindows-%version%
+cd %dest%\wxWindows-%version%
+unzip32 ..\wxMac-%version%.zip
+erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
+erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp
+
+cd %dest%
+
+erase wxMac-%version%.zip
+zip32 -r wxMac-%version%.zip wxWindows-%version%/*
+
+cd %src%
+
+Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
+echo Zipping individual components
+zip32 -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\deprecated.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
+zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
+
+echo Re-archiving wxWindows-%version%-win.zip
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%
+
+echo Removing .mms files
+zip32 -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms
+
+echo Creating %dest\wxWindows-%version%-DocSource.zip
zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%
+
+echo Creating %dest\wxWindows-%version%-WinHelp.zip
zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%
+
+echo Creating %dest\wxWindows-%version%-HTML.zip
zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%
+
+echo Creating %dest\wxWindows-%version%-PDF.zip
zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%
+
+Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%
+
+echo Creating %dest\wxWindows-%version%-HTB.zip
zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%
+
+echo Creating %dest\wxWindows-%version%-HTMLHelp.zip
zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%
+
+Rem Add Linuxy docs to a separate archive to be transported to Linux for the
+Rem Linux-based releases
+echo Creating %dest\wxWindows-%version%-LinuxDocs.zip
+zip32 -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.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
+echo Creating %dest\wxWindows-%version%-ExtraDoc.zip
+zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%
+
+Rem zip up Univ-specific files
+echo Creating %dest\wxWindows-%version%-Univ.zip
+zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
+call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%
rem VC++ project files
-zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
+echo Creating %dest\wxWindows-%version%-VC.zip
+zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%
rem BC++ project files
-zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp
+echo Creating %dest\wxWindows-%version%-BC.zip
+zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%
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
-
-rem MMedia
-zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp
-
-rem STC (Scintilla widget)
-zip32 -@ %dest\stc.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
-
-rem JPEG source
-zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
-
-rem TIFF source
-zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
-
-zip32 -@ %dest\wxxml.zip < %src\distrib\msw\xml.rsp
-
-zip32 -@ %dest\contrib.zip < %src\distrib\msw\contrib.rsp
+echo Creating %dest\wxWindows-%version%-CW.zip
+zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
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
-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
+Rem erase %dest\dialoged-source.zip
+Rem zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
+Rem zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+Rem erase %dest\dialoged-source.zip
+
+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\x11\install.txt %dest\install-x11-%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\x11\readme.txt %dest\readme-x11-%version%.txt
+copy %src\docs\x11\readme-nanox.txt %dest\readme-nanox-%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\base\readme.txt %dest\readme-base-%version%.txt
+copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt
+copy %src\docs\univ\readme.txt %dest\readme-univ-%version%.txt
+copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
+Rem copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
+Rem copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
Rem Skip Inno Setup if inno is 0.
if "%inno" == "0" goto end
Rem Make dialoged-win32.zip and tex2rtf-win32.zip
-cd %src\bin
-
-zip32 %dest\dialoged-win32.zip dialoged.*
-zip32 %dest\tex2rtf-win32.zip tex2rtf.*
+Rem cd %src\bin
+Rem zip32 %dest\dialoged-win32-%version%.zip dialoged.*
+Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
cd %dest
-rem Unzip the Windows files into 'wx'
-mkdir %dest\wx
+rem Put all archives for transit to Linux in a zip file
+echo Creating %dest\wxWindows-%version%-LinuxTransit.zip
+erase %dest\wxWindows-%version%-LinuxTransit.zip
+zip32 %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
+
+echo Unzipping the Windows files into wxWindows-%version%
+
+unzip32 -o wxWindows-%version%-win.zip
+unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-CW.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-HTMLHelp.zip
+unzip32 -o wxWindows-%version%-ExtraDoc.zip
+Rem Need Word file, for Remstar DB classes
+Rem Not any more
+Rem unzip32 -o wxWindows-%version%-Word.zip
Rem After this change of directory, we're in the
Rem temporary 'wx' directory and not acting on
Rem the source wxWindows directory.
-cd %dest\wx
-unzip32 -o ..\wxWindows-%version%-msw.zip
-unzip32 -o ..\wxWindows-%version%-gen.zip
-unzip32 -o ..\wxWindows-%version%-vc.zip
-unzip32 -o ..\wxWindows-%version%-bc.zip
-unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
-unzip32 -o ..\extradoc.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 ..\contrib.zip
-unzip32 -o ..\tex2rtf2.zip
+cd %dest%\wxWindows-%version%
rem Now delete a few files that are unnecessary
attrib -R *
-erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms
-erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in
-erase /Y setup.h.in setup.h_vms
-erase /SY Makefile.in
+erase /Y BuildCVS.txt descrip.mms
+erase /Y setup.h_vms
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
rem Now copy some binary files to 'bin'
if not isdir bin mkdir bin
copy %src\bin\dialoged.exe bin
+copy %src\bin\dialoged.hlp bin
+copy %src\bin\dialoged.chm bin
copy %src\bin\tex2rtf.exe bin
+copy %src\bin\tex2rtf.hlp bin
+copy %src\bin\tex2rtf.cnt 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
+
+if not direxist docs\pdf mkdir docs\pdf
+copy %src\docs\pdf\wxTutorial.pdf docs\pdf
Rem Make wxMSW-xxx.zip
-zip32 -r ..\wxMSW-%version%.zip *
+cd %dest%
+zip32 -r wxMSW-%version%.zip wxWindows-%version%/*
+cd wxWindows-%version%
-rem Time to regenerate the Inno Setup script, wxwin2.iss.
-rem NB: if you've changed wxwin2.iss using ScriptMaker, call splitinno.exe
-rem from within distrib\msw, to split off innotop.txt and innobott.txt.
-rem (NOT YET IMPLEMENTED)
echo Calling 'makeinno' to generate wxwin2.iss...
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...
-Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe
+Rem pause Press any key to continue with the wxWindows distribution...
:tidyup
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*.*
+
+erase /Y wxWindows-%version%-win.zip
+erase /Y wxWindows-%version%-ExtraDoc.zip
echo wxWindows archived.
goto end
:usage
-echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
-echo and optionally makes a deliver2\wx directory and a setup.exe
-echo if you specify 'inno' (skipping the zipping if you use 'innoonly').
+echo DOS wxWindows distribution. Zips up all MSW, OS/2, Mac and doc files,
+echo and optionally makes a setup.exe echo if you specify 'inno'
+echo (skipping the zipping if you use 'innoonly').
echo.
-echo "Usage: zipdist [inno | innoonly]"
+echo "Usage: zipdistinno [inno | innoonly]"
:end
projects / wxWidgets.git / blobdiff