CURDATE=`date -I`
WORKDIR=/home/bake/bkl-cronjob
+WINSRCDIR=/mnt/daily
FTPDIR=/home/ftp/pub
LD_LIBRARY_PATH=/usr/local/lib
-update_from_cvs()
+update_from_svn()
{
(
- cd ${WORKDIR}/wxWidgets && cvs -z3 update -P -d
- )
- (
- cd ${WORKDIR}/wxGTK && cvs -z3 update -P
+ cd ${WORKDIR}/wxWidgets
+ svn up
+ find . -name \.#\* | xargs rm -rf
)
+
}
regenerate_makefiles()
{
- (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O ${WORKDIR}/bakefile/bin/bakefile_gen)
+ (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen)
}
if test $archtype = tar ; then
tar czf ../archives/wx-mk-${format}-${CURDATE}.tar.gz $files
elif test $archtype = zip ; then
- zip -l -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files
+### zip -l -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files
+ zip -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files
fi
cd ..
}
-package_cvs()
-{
- rm -f ${WORKDIR}/archives/wx-cvs-$1*
- cd ${WORKDIR}/
- ##tar --exclude=*.ds* -jcf ./archives/test.tar.bz2 ./wxGTK
- tar --exclude=*.ds* -jcf ./archives/wx-cvs-$1-${CURDATE}.tar.bz2 ./$2
-}
+
package_makefiles()
{
do_package tar autoconf Makefile.in autoconf_inc.m4
- do_package zip borland makefile.bcc config.bcc
+ do_package zip gnu makefile.unx
+ do_package tar gnu makefile.unx
do_package zip mingw makefile.gcc config.gcc
do_package zip dmars makefile.dmc config.dmc makefile.dms config.dms
- do_package zip watcom makefile.wat config.wat
+ do_package zip watcom_msw makefile.wat config.wat
do_package zip msvc makefile.vc config.vc
do_package zip msvc6prj '*.dsp' '*.dsw'
+ do_package zip msvc7-8prj '*.vcproj' '*.sln'
do_package zip evcprj '*.vcp' '*.vcw'
+ (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen -f watcom -d ../os2/Bakefiles.os2.bkgen)
+ do_package zip watcom_os2 makefile.wat config.wat
}
copy_files ()
{
##delete old files and then copy new ones, add a symlink
-## CVS
-find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mtime +6 | xargs rm -rf
-cp ${WORKDIR}/archives/wx-cvs-* ${FTPDIR}/CVS_HEAD/files
-
-rm ${FTPDIR}/CVS_HEAD/wx* ${FTPDIR}/CVS_HEAD/MD5SUM
-for f in `find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\* -mmin -601` ; do
- ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
-done
-md5sum ${FTPDIR}/CVS_HEAD/wx* > ${FTPDIR}/CVS_HEAD/MD5SUM
-## make sure updated at is really last
-sleep 10
-echo cvs checkout done at `date -u` > ${FTPDIR}/CVS_HEAD/updated_at.txt
## Makefiles
-find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mtime +3 | xargs rm -rf
-cp ${WORKDIR}/archives/wx-mk-* ${FTPDIR}/CVS_Makefiles/files
+find ${FTPDIR}/Daily_Makefiles/files -type f -name wx-mk\* -mtime +3 | xargs rm -rf
+cp ${WORKDIR}/archives/wx-mk-* ${FTPDIR}/Daily_Makefiles/files
-rm ${FTPDIR}/CVS_Makefiles/wx* ${FTPDIR}/CVS_Makefiles/MD5SUM
+rm -f ${FTPDIR}/Daily_Makefiles/wx* ${FTPDIR}/Daily_Makefiles/MD5SUM
##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
+for f in `find ${FTPDIR}/Daily_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
done
-md5sum ${FTPDIR}/CVS_Makefiles/wx* > ${FTPDIR}/CVS_Makefiles/MD5SUM
+md5sum ${FTPDIR}/Daily_Makefiles/wx* > ${FTPDIR}/Daily_Makefiles/MD5SUM
sleep 10
-echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Makefiles/updated_at.txt
+echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/Daily_Makefiles/updated_at.txt
+## Setup.exe
+find ${FTPDIR}/Daily_HEAD/files -type f -name wx\* -mtime +3 | xargs rm -rf
+cp ${WORKDIR}/archives/win/*.exe ${FTPDIR}/Daily_HEAD/files
-## 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
-
-rm ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
+rm -f ${FTPDIR}/Daily_HEAD/*.exe ${FTPDIR}/Daily_HEAD/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}/Daily_HEAD/files -type f -name wx\*.exe -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
+md5sum ${FTPDIR}/Daily_HEAD/wx* > ${FTPDIR}/Daily_HEAD/MD5SUM
sleep 10
-echo CVS Documentation generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Docs/updated_at.txt
-}
-
-do_texrtf ()
-{
+echo CVS HEAD last updated at `date -u` > ${FTPDIR}/Daily_HEAD/updated_at.txt
-##parameters : subdir_of_tex index.tex dir_under_wxWidgets
-rm ${WORKDIR}/archives/html/$1/*
-/usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/$3/docs/latex/$1/$2 ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
-cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.gif ${WORKDIR}/archives/html/$1
-cp ${WORKDIR}/wxWidgets/$3/docs/latex/$1/*.css ${WORKDIR}/archives/html/$1
-cd ${WORKDIR}/archives/html/$1
-zip -l -q -9 ${WORKDIR}/archives/htb/$1.htb *.html *.css wx.hhc wx.hhp wx.hhk
-zip -q -9 ${WORKDIR}/archives/htb/$1.htb *.gif
-}
-##this one for tex2rtf as its latex docs aren't in latex...
-do_util_texrtf ()
-{
-##parameters : subdir_of_tex index.tex
-rm ${WORKDIR}/archives/html/$1/*
-/usr/local/bin/tex2rtf ${WORKDIR}/wxWidgets/utils/$1/docs/$2 ${WORKDIR}/archives/html/$1/$1 -twice -html -macros ${WORKDIR}/wxWidgets/docs/latex/wx/tex2rtf_css.ini
-cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.gif ${WORKDIR}/archives/html/$1
-cp ${WORKDIR}/wxWidgets/utils/$1/docs/*.css ${WORKDIR}/archives/html/$1
-cd ${WORKDIR}/archives/html/$1
-zip -l -q -9 ${WORKDIR}/archives/htb/$1.htb *.html *.css wx.hhc wx.hhp wx.hhk
-zip -q -9 ${WORKDIR}/archives/htb/$1.htb *.gif
-}
-
-do_docs ()
-{
-##remove files, then regenerate
-rm ${WORKDIR}/archives/wx-docs*
-rm ${WORKDIR}/archives/htb/*.*
-
-######### dir index.tex rootdir
-do_texrtf wx manual.tex
-do_texrtf book book.tex
-do_texrtf svg dcsvg.tex contrib
-do_texrtf ogl ogl.tex contrib
-do_texrtf mmedia mmedia.tex contrib
-do_texrtf gizmos manual.tex contrib
-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/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
-
-##remove .con files
-rm ${WORKDIR}/*.con
}
-<<<<<<< rebuild-makefiles.sh
-add_win_docs ()
-{
-### starts with wx-docs-xxx.zip
-for f in `find ${WORKDIR}/archives/win/ -name wx\* ` ; do
- mv $f ${WORKDIR}/archives/`basename $f | tr -d ".ZIP"`-${CURDATE}.zip
- done
-
-}
-
-=======
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 wx***.zip
+
+for f in `find ${WINSRCDIR}/ -maxdepth 1 -name wx\*.zip ` ; do
+ cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.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 ${WINSRCDIR}/ -maxdepth 1 -name wx\*.exe ` ; do
+ cp $f ${WORKDIR}/archives/win/`basename $f | sed -e "s/.exe//"`-${CURDATE}.exe
done
}
->>>>>>> 1.4
-update_from_cvs
+update_from_svn
regenerate_makefiles
package_makefiles
-package_cvs All wxWidgets
-package_cvs Gtk wxGTK
-
-<<<<<<< rebuild-makefiles.sh
-do_docs
-add_win_docs
-=======
-do_docs
+
+
add_win_files
->>>>>>> 1.4
copy_files