From fa1ac35ed4a2083ca7320841ed622cc0b095c26f Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Thu, 23 Apr 2009 14:52:38 +0000
Subject: [PATCH] windows and docs built for 2.9.0rc1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/script/win_docs.bat  | 84 ++++++++++++++++----------------------
 build/script/wxwidgets.iss |  6 +--
 2 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index b13245b763..81413b920b 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,5 +1,5 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-rem SET WXW_VER=2.9.0
+SET WXW_VER=2.9.0-rc1
 if (%WXW_VER%)==() SET WXW_VER=SVN
 
 echo docs building for %WXW_VER%
@@ -12,17 +12,15 @@ rem  writes a log file in c:\
 
 echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
 
-set WXWIN=c:\wx\wxWidgets
+set WXWIN=c:\wx\wx29b
 set DAILY=c:\daily
 
 rem svn already in my path...
-set PATH=%PATH%;C:\wx\WXWIDG~1.0\utils\tex2rtf\src\vc_based;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
-set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
-rem add nmake to the path to build the docs
-call  \vc6
+set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
+
 echo %PATH% >>  c:\temp.log
 rem add bakefile build...
-set PATH=%PATH%;C:\wx\Bakefile\src
+set PATH=%PATH%;C:\wx\Bakefile
 
 SET >>  c:\temp.log
 
@@ -34,13 +32,19 @@ svn cleanup >>  c:\temp.log
 svn up >>  c:\temp.log
 
 rem now inno
-cd \wx\inno\wxWidgets >>  c:\temp.log
-svn cleanup >>  c:\temp.log
-svn up >>  c:\temp.log
-del c*.*
+cd \wx\inno\wx29b >>  c:\temp.log
+rem Don't update the svn automatically
+rem svn cleanup >>  c:\temp.log
+rem svn up >>  c:\temp.log
+
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h
 
+del c*.*
+svn up configure
+svn up configure.in
+svn up config.guess
+svn up config.sub
 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
@@ -49,52 +53,34 @@ copy include\wx\univ\setup0.h include\wx\univ\setup.h
 echo SVN update  >>  c:\temp.log
 
 rem just build the formats not in the SVN to keep down the .#makefile...
-cd \wx\inno\wxWidgets\build\bakefiles
+cd \wx\inno\wx29b\build\bakefiles
 del .bakefile_gen.state
-bakefile_gen -f dmars,dmars_smake,msevc4prj >> c:\temp.log
+bakefile_gen -k -f dmars,dmars_smake,msevc4prj >> c:\temp.log
 
 
-cd %WXWIN%\build\script
-nmake -f makedocs.vc cleandocs
-nmake -f makedocs.vc alldocs
 
-del %DAILY%\in\*.p*
-mkdir %WXWIN%\docs\pdf
-mkdir %WXWIN%\docs\htmlhelp
-mkdir %WXWIN%\docs\htb
-echo starting word >>  c:\temp.log
-start /WAIT winword /mwx_ps
+rem make and copy chm to inno
+rem Now create standalone copies of docs (chm and htb)
+cd %WXWIN%\docs\doxygen
+del out\html\*.html
+del out\html\*.htb
+del out\*.chm
+call regen chm
 
 
-echo cvs doc up part 2 >>  c:\temp.log
+cd %WXWIN%\docs\doxygen\out
+zip wxWidgets-%WXW_VER%-chm.zip wx.chm
+copy wxWidgets-%WXW_VER%-chm.zip %DAILY%
+cd html
+del *.dot
+del *.md5
+zip -r wx.htb *.*
+zip wxWidgets-%WXW_VER%-htb.zip wx.htb
+copy wxWidgets-%WXW_VER%-htb.zip %DAILY%
 
-cd %DAILY%\in
-call ps2pdf wx.ps >>  c:\temp.log
-call ps2pdf tex2rtf.ps >> c:\temp.log
 
-echo Zipping
-cd %WXWIN%
-del %DAILY%\*.zip
-zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm 
-zip %DAILY%\wxWidgets-%WXW_VER%-HTB.zip docs\htb\*.htb utils/tex2rtf/docs/*.htb 
-zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt 
-zip -r %DAILY%\wxWidgets-%WXW_VER%-HTML.zip docs\html\* utils\tex2rtf\docs\html\* -x CVS -x *.con -x *.hh* -x *.ref -x *.htx -x *.cn1 -x docs\html\CVS\*
-
-del %DAILY%\*.tar.gz
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTB.tar.gz docs/htb/*.htb utils/tex2rtf/docs/*.htb 
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTML.tar.gz  --exclude CVS --exclude *.con --exclude *.hh* --exclude *.ref --exclude *.htx --exclude *.cn1 --exclude docs/html/CVS/* docs/html/* utils/tex2rtf/docs/html/*
-
-cd %DAILY%\
-mkdir docs
-mkdir docs\pdf
-del docs\pdf\*.pdf
-move in\*.pdf docs\pdf
-zip wxWidgets-%WXW_VER%-PDF.zip docs\pdf\*.pdf
-
-rem copy chm to inno
-cd %WXWIN%
-mkdir c:\wx\inno\wxWidgets\docs\htmlhelp
-copy docs\htmlhelp\wx.chm \wx\inno\wxWidgets\docs\htmlhelp\wx.chm
+mkdir c:\wx\inno\wx29b\docs\htmlhelp
+copy %WXWIN%\docs\doxygen\out\wx.chm \wx\inno\wx29b\docs\htmlhelp\wx.chm
 cd %WXWIN%\build\script
 iscc wxwidgets.iss >> c:\temp.log
 
diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index b892aec1d6..18c7b965cd 100644
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -2,16 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"
-    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildSVN.txt"
+    #define INFOFILE  "C:\wx\inno\wx29b\BuildSVN.txt"
     #define WX_VERSION "SVN"
 #else
-    #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
+    #define INFOFILE "C:\wx\inno\wx29b\docs\msw\install.txt"
     #define WX_VERSION GetENV("WXW_VER")
 #endif
 
 #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
 
-#define INNODIR "C:\wx\inno\wxWidgets"
+#define INNODIR "C:\wx\inno\wx29b"
 
 [Setup]
 AppName=wxWidgets