Reverted/commented out unsuccessful defer fix

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

diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh
index 78a7dc9edf87897a1a53d250c0c802e6711e7d1f..64576bf2f34c1663dbeca84a105150a75382ed35 100644 (file)
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -67,11 +67,11 @@ copy_files ()
 {
 ##delete old files and then copy new ones, add a symlink
 ## CVS
 {
 ##delete old files and then copy new ones, add a symlink
 ## CVS

-find ${FTPDIR}/CVS_HEAD/files -type f -name wx-cvs\*.tar.bz2 -mtime +6 | xargs rm -rf
+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*
 cp  ${WORKDIR}/archives/wx-cvs-* ${FTPDIR}/CVS_HEAD/files
 
 rm ${FTPDIR}/CVS_HEAD/wx*

-for f in `find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-cvs\* -mmin -601` ; do
+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
 ## make sure updated at is really last
        ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
 done
 ## make sure updated at is really last


@@ -113,7 +113,8 @@ rm ${WORKDIR}/archives/html/$1/*
 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
 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 *.gif *.css wx.hhc wx.hhp wx.hhk
+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...
 }
 
 ##this one for tex2rtf as its latex docs aren't in latex...


@@ -125,7 +126,8 @@ rm ${WORKDIR}/archives/html/$1/*
 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
 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 *.gif *.css wx.hhc wx.hhp wx.hhk
+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 ()
 }
 
 do_docs ()