fixed Unicode-mode only bug in Validate()

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

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index fee10dbb0129dc848d9c96ab62e1f7b7487b3de7..62eab13e53235bb47a04886c8338cbc7f526d9cf 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -3,6 +3,7 @@ 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


@@ -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...
 


@@ -77,7 +85,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


@@ -94,6 +102,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
 


@@ -175,6 +186,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