Revert last commit.

[wxWidgets.git] / build / script / rebuild-makefiles.sh

diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh
index 2ca6c25ca6a168e1abbcf6400f0abe3112ea3407..95f8bfdac52884c52141c5b651369a490f898be6 100644 (file)
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -9,7 +9,9 @@ LD_LIBRARY_PATH=/usr/local/lib
 update_from_cvs()
 {
     (
-    cd ${WORKDIR}/wxWidgets &&  cvs -z3 update -P -d
+    cd ${WORKDIR}/wxWidgets 
+    cvs -z3 update -P -d
+    find . -name \.#\* | xargs rm -rf
     )
 
 }
@@ -17,7 +19,7 @@ update_from_cvs()
 
 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)
 }
 
 
@@ -55,10 +57,12 @@ package_makefiles()
     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 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 ()
@@ -82,12 +86,12 @@ echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR
 find ${FTPDIR}/CVS_HEAD/v1/files -type f -name wx\* -mtime +3 | xargs rm -rf
 cp  ${WORKDIR}/archives/win/*.exe ${FTPDIR}/CVS_HEAD/v1/files
 
-rm -f ${FTPDIR}/CVS_HEAD/v1/*.exe ${FTPDIR}/CVS_Makefiles/MD5SUM
+rm -f ${FTPDIR}/CVS_HEAD/v1/*.exe ${FTPDIR}/CVS_HEAD/v1/MD5SUM
 ##there must be an easier way of doing these links...
 for f in `find ${FTPDIR}/CVS_HEAD/v1/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_HEAD/v1/wx* > ${FTPDIR}/CVS_Makefiles/MD5SUM
+md5sum ${FTPDIR}/CVS_HEAD/v1/wx* > ${FTPDIR}/CVS_HEAD/v1/MD5SUM
 sleep 10
 echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/CVS_HEAD/v1/updated_at.txt
 
@@ -161,12 +165,10 @@ 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-html-${CURDATE}.tar.gz `find . -name '*.gif' -print -o -name '*.html' -print` html/wx/*.css
 
-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
-zip -q -9 ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.zip htb/wx.htb
+tar zcvf ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.tar.gz  htb/*
+zip -q -9 ${WORKDIR}/archives/wx-docs-htb-${CURDATE}.zip htb/*
 
 ##remove .con files
 rm ${WORKDIR}/*.con