X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f9a324c17fe78f009aeac98ea1ca5246fe72f1a..a1312bc8b202eb7f5c0bdc581f92a6ac39dfebde:/build/script/rebuild-makefiles.sh

diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh
index 10209ca904..c8d1f2f08a 100644
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -6,10 +6,12 @@ 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}/wxWidgets 
+    svn up
+    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 ()
@@ -66,45 +70,45 @@ copy_files ()
 ##delete old files and then copy new ones, add a symlink
 
 ## 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 -f ${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}/CVS_HEAD/v1/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/win/*.exe ${FTPDIR}/CVS_HEAD/v1/files
+find ${FTPDIR}/Daily_HEAD/files -type f -name wx\* -mtime +3 | xargs rm -rf
+cp  ${WORKDIR}/archives/win/*.exe ${FTPDIR}/Daily_HEAD/files
 
-rm -f ${FTPDIR}/CVS_HEAD/v1/*.exe ${FTPDIR}/CVS_HEAD/v1/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_HEAD/v1/files -type f -name wx\*.exe -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_HEAD/v1/wx* > ${FTPDIR}/CVS_HEAD/v1/MD5SUM
+md5sum ${FTPDIR}/Daily_HEAD/wx* > ${FTPDIR}/Daily_HEAD/MD5SUM
 sleep 10
-echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/CVS_HEAD/v1/updated_at.txt
+echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/Daily_HEAD/updated_at.txt
 
 
 ## Docs...
-find ${FTPDIR}/CVS_Docs/files -type f -name wx\* -mtime +3 | xargs rm -rf
-cp  ${WORKDIR}/archives/wx-doc* ${FTPDIR}/CVS_Docs/files
-cp  ${WORKDIR}/archives/win/wxW* ${FTPDIR}/CVS_Docs/files
+find ${FTPDIR}/Daily_Docs/files -type f -name wx\* -mtime +3 | xargs rm -rf
+cp  ${WORKDIR}/archives/wx-doc* ${FTPDIR}/Daily_Docs/files
+cp  ${WORKDIR}/archives/win/wxW* ${FTPDIR}/Daily_Docs/files
 
-rm -f ${FTPDIR}/CVS_Docs/wx* ${FTPDIR}/CVS_Docs/MD5SUM
+rm -f ${FTPDIR}/Daily_Docs/wx* ${FTPDIR}/Daily_Docs/MD5SUM
 ##there must be an easier way of doing these links...
-for f in `find ${FTPDIR}/CVS_Docs/files -type f -name wx\* -mmin -601` ; do
+for f in `find ${FTPDIR}/Daily_Docs/files -type f -name wx\* -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_Docs/wx* > ${FTPDIR}/Daily_Docs/MD5SUM
 sleep 10
-echo CVS Documentation generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Docs/updated_at.txt
+echo CVS Documentation generated from bakefiles last updated at `date -u` > ${FTPDIR}/Daily_Docs/updated_at.txt
 }
 
 do_texrtf ()
@@ -152,12 +156,12 @@ 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_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/
@@ -176,17 +180,17 @@ add_win_files ()
 {
 ### starts with wx***.zip
 
-for f in `find ${WINSRCDIR}/ -name wx\*.zip ` ; do       
+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
 
-for f in `find ${WINSRCDIR}/ -name wx\*.exe ` ; do       
+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
 
 }
 
-update_from_cvs
+update_from_svn
 regenerate_makefiles
 package_makefiles