copy %webfiles%\site\platform.htm %src\docs\html
copy %webfiles%\site\i18n.htm %src\docs\html
-cd %src
+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
+
+cd %src%
echo Zipping...
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\makefile.rsp
Rem Rearchive under wxWindows-%version%
-call %WXWIN%\distrib\msw\rearchive wxOS2-%version%.zip wxWindows-%version% %dest%
+if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\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%/*
-zip32 -d %dest%\wxOS2-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+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.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\stc.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
-call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest%
-zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+erase /Y %src%\include\wx\setup.h
+
+if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\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
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\os2\install.txt %dest\install-os2-%version%.txt
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