wxHtmlHelpController made compatible with other controllers

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 48878c01767ce252169160d553f5ddd0ac9454d7..27e23db06f7932692b7d8b3b324ef2905bb47fe6 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -5,7 +5,7 @@ set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_13
+set version=2_1_14
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -22,7 +22,6 @@ echo CTRL-C if this is not correct.
 pause
 
 erase %dest\wx*.zip
-erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip
@@ -62,15 +61,12 @@ 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
 
@@ -107,15 +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 ..\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
@@ -131,7 +127,7 @@ 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 *setup.*
+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
@@ -160,6 +156,9 @@ 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.*