Some corrections

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 9a919141e8607037cef619f08d2470dc7e628d0f..318903d3018b4ac5d65091e4a0e03c05f257ae98 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -5,13 +5,14 @@ set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_11
+set version=2_1_13
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
 if "%1" == "-help" goto usage
 if "%1" == "--help" goto usage
 if "%1" == "/?" goto usage
+if "%1" == "wiseonly" goto dounzip
 if "%1" == "wise" set wise=1
 echo About to archive an external wxWindows distribution:
 echo   From   %src
@@ -20,13 +21,11 @@ if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause
 
-rem goto dounzip
-
 erase %dest\wx*.zip
-erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip
+erase %dest\tiff.zip
 
 if direxist %dest\wx deltree /Y %dest\wx
 
@@ -42,7 +41,7 @@ zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
 zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
 zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
+Rem (Obsolete) zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
 
 zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
 zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
@@ -62,33 +61,34 @@ zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp
 rem OGL 3
 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
 
-rem GLCanvas
-zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.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 wxTreeLayout
-zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.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
+
 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\release.txt %dest
 copy %src\docs\motif\makewxmotif %dest
 copy %src\docs\gtk\makewxgtk %dest
 
+Rem Skip WISE setup if wise is 0.
+if "%wise" == "0" goto end
+
 :dounzip
 
 cd %dest
 
-Rem Skip WISE setup if wise is 0.
-if "%wise" == "0" goto end
-
 rem Unzip the Windows files into 'wx'
 mkdir %dest\wx
 
@@ -103,14 +103,15 @@ unzip32 -o ..\wx%version%_bc.zip
 unzip32 -o ..\wx%version%_hlp.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wx%version%_wrd.zip
-unzip32 -o ..\glcanvas.zip
-unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
-unzip32 -o ..\tex2rtf3.zip
+unzip32 -o ..\tiff.zip
+unzip32 -o ..\tex2rtf2.zip
 
 rem Now delete a few files that are unnecessary
-erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
+attrib -R *
+erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms
+erase /Y setup.h.in setup.h_vms
 erase /SY Makefile.in
 rem erase /Y docs\pdf\ogl.pdf
 rem deltree /Y docs\html\ogl
@@ -126,6 +127,8 @@ rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 
+erase /Y %dest\setup.*
+
 rem Now invoke WISE install on the new wxwin2.wse
 set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
 echo Invoking %wisecmd...
@@ -134,14 +137,40 @@ Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
 
 cd %dest
 
+Rem tidy up capitalisation of filenames
+ren setup.EXE s
+ren s setup.exe
+
+ren setup.w02 s
+ren s setup.w02
+
+ren setup.w03 s
+ren s setup.w03
+
+ren setup.w04 s
+ren s setup.w04
+
+ren setup.w05 s
+ren s setup.w05
+
+ren setup.w06 s
+ren s setup.w06
+
+ren setup.w07 s
+ren s setup.w07
+
+rem Put all the setup files into a single zip archive.
+zip32 wx%version%_setup.zip readme.txt setup.*
+
 echo wxWindows archived.
+
 goto end
 
 :usage
 echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
 echo and optionally makes a deliver\wx directory and a setup.exe
-echo if you specify 'wise'.
+echo if you specify 'wise' (skipping the zipping if you use 'wiseonly').
 echo.
-echo Usage: zipdist [wise]
+echo Usage: zipdist [wise | wiseonly]
 
 :end