Merge extra documents with main doc archives to help reduce user confusion/fatigue.

Rename doc archive names to something more readable.
.zip should be lower case.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-10-29 17:32:44 +00:00
parent 781609f290
commit bc70ac6db4
2 changed files with 21 additions and 19 deletions

View File

@ -98,12 +98,12 @@ echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR
## Docs...
find ${FTPDIR}/CVS_Docs/files -type f -name wx-do\* -mtime +3 | xargs rm -rf
cp ${WORKDIR}/archives/wx-docs-* ${FTPDIR}/CVS_Docs/files
find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mtime +3 | xargs rm -rf
cp ${WORKDIR}/archives/wxWidgets-Docs-* ${FTPDIR}/CVS_Docs/files
rm ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
##there must be an easier way of doing these links...
for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wx-do\* -mmin -601` ; do
for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wxWidgets-Do\* -mmin -601` ; do
ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
done
md5sum ${FTPDIR}/CVS_Docs/wx* > ${FTPDIR}/CVS_Docs/MD5SUM
@ -140,7 +140,7 @@ zip -q -9 ${WORKDIR}/archives/htb/$1.htb *.gif
do_docs ()
{
##remove files, then regenerate
rm ${WORKDIR}/archives/wx-docs*
rm ${WORKDIR}/archives/wxWidgets-Docs*
rm ${WORKDIR}/archives/htb/*.*
######### dir index.tex rootdir
@ -154,11 +154,13 @@ do_texrtf fl fl.tex contrib
do_util_texrtf tex2rtf tex2rtf.tex
cd ${WORKDIR}/archives/
tar zcvf ${WORKDIR}/archives/wx-docs-html-${CURDATE}.tar.gz html/wx/*.html html/wx/*.gif html/wx/*.css
tar zcvf ${WORKDIR}/archives/wx-docs-extra-html-${CURDATE}.tar.gz `find . -name 'wx' -prune -o -name '*.html' -print`
tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTML-${CURDATE}.tar.gz html/wx/*.html html/wx/*.gif html/wx/*.css
# TODO: include the extra HTML docs into the above archive.
# TODO: we need to add the version number to the doc archives
# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTML-${CURDATE}.tar.gz `find . -name 'wx' -prune -o -name '*.html' -print`
tar zcvf ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.tar.gz htb/wx.htb
tar zcvf ${WORKDIR}/archives/wx-docs-extra-htb-${CURDATE}.tar.gz --exclude wx.htb htb/*.htb
tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-HTB-${CURDATE}.tar.gz htb/*.htb
# tar zcvf ${WORKDIR}/archives/wxWidgets-Docs-Extra-HTB-${CURDATE}.tar.gz --exclude wx.htb htb/*.htb
##remove .con files
rm ${WORKDIR}/*.con
@ -168,14 +170,14 @@ rm ${WORKDIR}/*.con
add_win_files ()
{
### starts with wx-docs-xxx.zip
for f in `find ${WORKDIR}/archives/win/ -name wx\*.ZIP ` ; do
mv $f ${WORKDIR}/archives/`basename $f | tr -d ".ZIP"`-${CURDATE}.zip
### starts with wxWidgets-Docs-xxx.zip
for f in `find ${WORKDIR}/archives/win/ -name wx\*.zip ` ; do
mv $f ${WORKDIR}/archives/`basename $f | tr -d ".zip"`-${CURDATE}.zip
done
rm ${WORKDIR}/archives/*.exe
for f in `find ${WORKDIR}/archives/win/ -name wx\*.EXE ` ; do
mv $f ${WORKDIR}/archives/`basename $f | tr -d ".EXE"`-${CURDATE}.exe
for f in `find ${WORKDIR}/archives/win/ -name wx\*.exe ` ; do
mv $f ${WORKDIR}/archives/`basename $f | tr -d ".exe"`-${CURDATE}.exe
done
}

View File

@ -60,17 +60,17 @@ iscc wxwidgets.iss >> c:\temp.log
echo Zipping
cd %WXWIN%
del %DAILY%\*.zip
zip %DAILY%\wx-docs-chm.ZIP docs\htmlhelp\wx.chm
zip %DAILY%\wx-docs-hlp.ZIP docs\winhelp\wx.hlp docs\winhelp\wx.cnt
zip %DAILY%\wx-docs-extra-hlp.ZIP utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt -x docs/winhelp/wx.hlp docs/winhelp/wx.*
zip %DAILY%\wx-docs-extra-chm.ZIP utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
zip %DAILY%\wxWidgets-Docs-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
zip %DAILY%\wxWidgets-Docs-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt
Rem zip %DAILY%\wx-docs-extra-hlp.ZIP utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt -x docs/winhelp/wx.hlp docs/winhelp/wx.*
Rem zip %DAILY%\wx-docs-extra-chm.ZIP utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
cd %DAILY%\
mkdir docs
mkdir docs\pdf
del docs\pdf\*.pdf
move in\*.pdf docs\pdf
zip wx-docs-pdf.ZIP docs\pdf\wx.pdf
zip wx-docs-extra-pdf.ZIP docs\pdf\*.pdf -x docs\pdf\wx.pdf
zip wxWidgets-Docs-PDF.zip docs\pdf\*.pdf
Rem zip wx-docs-extra-pdf.ZIP docs\pdf\*.pdf -x docs\pdf\wx.pdf
echo setting S