Script mods

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

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index dea59e0e1d0002b0c8a56f4ae89dbdf0dc9d5227..8eb74cc88c255746ef26adeeb25316cac49f585c 100755 (executable)
--- 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
 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 inno=0
 
 Rem Set this to the required version

-set version=2.3.0
+set version=2.3.3

 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage


@@ -43,6 +44,13 @@ erase %dest\make*
 if direxist %dest\wx erase /sxyz %dest\wx\
 if not direxist %dest mkdir %dest
 
 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...
 
 cd %src
 echo Zipping...
 


@@ -55,16 +63,36 @@ 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 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
 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\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

 
 Rem Below is the old-style separated-out format. This is retained only
 Rem for local use, and for creating wxMSW-xxx.zip.
 
 Rem Below is the old-style separated-out format. This is retained only
 Rem for local use, and for creating wxMSW-xxx.zip.


@@ -75,7 +103,7 @@ 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 -@ -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
 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


@@ -92,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 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
 
 rem VC++ project files
 zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
 


@@ -122,31 +153,32 @@ zip32 -@ %dest\jpeg-%version%.zip < %src\distrib\msw\jpeg.rsp
 rem TIFF source
 zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
 
 rem TIFF source
 zip32 -@ %dest\tiff-%version%.zip < %src\distrib\msw\tiff.rsp
 

-zip32 -@ %dest\wxxml-%version%.zip < %src\distrib\msw\xml.rsp
+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
 
 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
 
 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\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%
 
 copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
 copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%
 


@@ -173,6 +205,7 @@ Rem the source wxWindows directory.
 cd %dest\wx
 unzip32 -o ..\wxWindows-%version%-msw.zip
 unzip32 -o ..\wxWindows-%version%-gen.zip
 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 ..\wxWindows-%version%-vc.zip
 unzip32 -o ..\wxWindows-%version%-bc.zip
 unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip


@@ -180,9 +213,11 @@ unzip32 -o ..\extradoc-%version%.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wxWindows-%version%-Word.zip
 unzip32 -o ..\ogl3-%version%.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wxWindows-%version%-Word.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 ..\jpeg-%version%.zip
 unzip32 -o ..\tiff-%version%.zip

-unzip32 -o ..\wxxml-%version%.zip
+unzip32 -o ..\wxxrc-%version%.zip

 unzip32 -o ..\contrib-%version%.zip
 unzip32 -o ..\tex2rtf2-%version%.zip
 
 unzip32 -o ..\contrib-%version%.zip
 unzip32 -o ..\tex2rtf2-%version%.zip
 


@@ -193,11 +228,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 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
 erase /sxzy contrib\docs\latex\ogl
 erase /Y src\mingegcs.bat
 erase /Y distrib


@@ -207,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\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 bin

+copy %src\bin\life.exe.manifest bin

 copy %src\demos\life\breeder.lif 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 *
 
 Rem Make wxMSW-xxx.zip
 zip32 -r ..\wxMSW-%version%.zip *


@@ -225,7 +263,7 @@ call %WXWIN\distrib\msw\makeinno.bat
 erase /Y %dest\setup.*
 
 rem Now invoke Inno Setup on the new wxwin2.iss
 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...
 echo Invoking %innocmd...
 start "Inno Setup" /w %innocmd%
 pause Press any key to continue with the wxWindows distribution...