wxLocale now uses wxEncodingConverter (must be explicitly enabled)

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 3d290538944a7bcb6aaf3703a438ad9319c7c85e..929f4a05984bd6a9d569fa5ff8ea24720c1f459a 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -12,6 +12,7 @@ if "%dest" == "" goto usage
 if "%1" == "-help" goto usage
 if "%1" == "--help" goto usage
 if "%1" == "/?" 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
 if "%1" == "wise" set wise=1
 echo About to archive an external wxWindows distribution:
 echo   From   %src


@@ -20,8 +21,6 @@ if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause
 
 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\wx*.zip
 erase %dest\glcanvas.zip
 erase %dest\ogl3.zip


@@ -79,16 +78,17 @@ 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\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
 
 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
 
 :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
 
 rem Unzip the Windows files into 'wx'
 mkdir %dest\wx
 


@@ -107,12 +107,13 @@ unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.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
 erase /SY Makefile.in
 
 rem Now delete a few files that are unnecessary
 erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
 erase /SY Makefile.in

-erase /Y docs\pdf\ogl.pdf
-deltree /Y docs\html\ogl
+rem erase /Y docs\pdf\ogl.pdf
+rem deltree /Y docs\html\ogl

 
 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin
 
 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin


@@ -125,21 +126,47 @@ 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
 
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 

+erase /Y 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...
 start /w %wisecmd
 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...
 start /w %wisecmd

+Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe

 
 cd %dest
 
 
 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
+
+rem Put all the setup files into a single zip archive.
+zip32 setup.zip readme.txt setup.*
+

 echo wxWindows archived.
 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
 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.

-echo Usage: zipdist [wise]
+echo Usage: zipdist [wise | wiseonly]

 
 :end
 
 :end