small reorganization; no real change

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

diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh
index ec128f53d4a671cfe62c30688803016d40ae58ba..7dafec203a4e2720caa0417990961d99f4569f06 100644 (file)
--- a/build/script/rebuild-makefiles.sh
+++ b/build/script/rebuild-makefiles.sh
@@ -2,19 +2,24 @@
 
 CURDATE=`date -I`
 WORKDIR=/home/bake/bkl-cronjob
 
 CURDATE=`date -I`
 WORKDIR=/home/bake/bkl-cronjob

+WINSRCDIR=/mnt/daily

 FTPDIR=/home/ftp/pub
 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

     )
     )

+

 }
 
 
 regenerate_makefiles()
 {
 }
 
 
 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)

 }
 
 
 }
 
 


@@ -36,68 +41,88 @@ do_package()
     if test $archtype = tar ; then
         tar czf ../archives/wx-mk-${format}-${CURDATE}.tar.gz $files
     elif test $archtype = zip ; then
     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
-        # (-l translates to DOS line endings)
+###        zip -l -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files
+        zip -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files

     fi
     
     cd ..
 }
 
     fi
     
     cd ..
 }
 

-package_cvs()
-{
-    rm -f ${WORKDIR}/archives/wx-cvs-*
-    cd ${WORKDIR}/
-    tar jcf ./archives/wx-cvs-${CURDATE}.tar.bz2 ./wxWidgets
-}
+

 
 
 package_makefiles()
 {
     do_package tar autoconf  Makefile.in autoconf_inc.m4
 
 
 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 mingw     makefile.gcc config.gcc

-    do_package zip dmars     makefile.dmc config.dmc
-    do_package zip watcom    makefile.wat config.wat
+    do_package zip dmars     makefile.dmc config.dmc makefile.dms config.dms
+    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 msvc      makefile.vc config.vc
     do_package zip msvc6prj  '*.dsp' '*.dsw'

+    do_package zip msvc7-8prj  '*.vcproj' '*.sln'    

     do_package zip evcprj    '*.vcp' '*.vcw'
     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
 }
 
 copy_files ()
 {
 ##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
-cp  ${WORKDIR}/archives/wx-cvs-* ${FTPDIR}/CVS_HEAD/files

 
 

-rm ${FTPDIR}/CVS_HEAD/wx-cvs.tar.bz2
-ln -s  ${FTPDIR}/CVS_HEAD/files/wx-cvs-${CURDATE}.tar.bz2  ${FTPDIR}/CVS_HEAD/wx-cvs.tar.bz2
-## make sure updated at is really last
+## Makefiles
+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}/Daily_Makefiles/wx* ${FTPDIR}/Daily_Makefiles/MD5SUM
+##there must be an easier way of doing these links...
+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}/Daily_Makefiles/wx* > ${FTPDIR}/Daily_Makefiles/MD5SUM

 sleep 10
 sleep 10

-echo cvs checkout done at  `date -u` > ${FTPDIR}/CVS_HEAD/updated_at.txt
+echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/Daily_Makefiles/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
+## 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

 
 

-rm ${FTPDIR}/CVS_Makefiles/wx*
-##there musrt be an easier way of doing these links...
-for f in `find ${FTPDIR}/CVS_Makefiles/files -type f -name wx-mk\* -mmin -601` ; do
+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}/Daily_HEAD/files -type f -name wx\*.exe -mmin -601` ; do

        ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
        ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `

-#      echo $f      
-#      echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||"

 done
 done

+md5sum ${FTPDIR}/Daily_HEAD/wx* > ${FTPDIR}/Daily_HEAD/MD5SUM

 sleep 10
 sleep 10

-echo CVS Makefiles generated from bakefiles last updated at `date -u` > ${FTPDIR}/CVS_Makefiles/updated_at.txt
+echo CVS HEAD  last updated at `date -u` > ${FTPDIR}/Daily_HEAD/updated_at.txt
+
+
+

 }
 
 
 }
 
 

+add_win_files ()
+{
+### 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
+
+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
 regenerate_makefiles
 package_makefiles

-package_cvs

 
 

-copy_files

 
 

+add_win_files
+
+copy_files

 
 

+exit 0