A script for helping make RPMs

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

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 8e7fc0a2653510d6122b13364e913a2d4ba91bc4..ba67aac0045982069ec27afe886c3667f56662f4 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -4,10 +4,10 @@ rem using Inno Setup + ScriptMaker
 set src=%wxwin
 set dest=%src\deliver
 set webfiles=c:\wx2dev\wxWebSite
-set inno=0
+set inno=1
 
 Rem Set this to the required version
-set version=2.3.3
+set version=2.5.0
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -45,7 +45,7 @@ if direxist %dest\wx erase /sxyz %dest\wx\
 if not direxist %dest mkdir %dest
 if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
 
-# Copy FAQ from wxWebSite CVS
+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
@@ -56,14 +56,14 @@ 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
+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
@@ -77,9 +77,29 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.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 %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
 
-zip32 -d %dest%\wxOS2-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+cd %dest%
+
+erase wxOS2-%version%.zip
+zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
+
+cd %src%
 
 echo Zipping wxMac distribution
 
@@ -87,7 +107,7 @@ 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
@@ -99,11 +119,24 @@ 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
 
+zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
+
 erase /Y %src%\include\wx\setup.h
 
-call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest%
+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%/*
 
-zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+cd %src%
 
 Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
 echo Zipping individual components
@@ -188,10 +221,12 @@ 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
-copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
-copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
+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
@@ -239,7 +274,11 @@ 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