diff --git a/build/script/rebuild-makefiles.sh b/build/script/rebuild-makefiles.sh deleted file mode 100755 index f484eaa8b9..0000000000 --- a/build/script/rebuild-makefiles.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh - -CURDATE=`date -I` -WORKDIR=/home/bake/bkl-cronjob -WINSRCDIR=/mnt/daily -FTPDIR=/home/ftp/pub -LD_LIBRARY_PATH=/usr/local/lib - -update_from_svn() -{ - ( - cd ${WORKDIR}/wxWidgets - svn up - find . -name \.#\* | xargs rm -rf - ) - -} - - -regenerate_makefiles() -{ - (cd ${WORKDIR}/wxWidgets/build/bakefiles && nice python -O /usr/local/bin/bakefile_gen) -} - - -do_package() -{ - archtype=$1 - format=$2 - shift ; shift - - rm -f ${WORKDIR}/archives/wx-mk-${format}-* - - cd ${WORKDIR}/wxWidgets - - files="" - for i in $* ; do - files="$files `find -name "$i"`" - done - - 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 -q -9 ../archives/wx-mk-${format}-${CURDATE}.zip $files - fi - - cd .. -} - - - - -package_makefiles() -{ - do_package tar autoconf Makefile.in autoconf_inc.m4 - do_package zip gnu makefile.unx - do_package tar gnu makefile.unx - do_package zip mingw makefile.gcc config.gcc - 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' -} - -copy_files () -{ -##delete old files and then copy new ones, add a symlink - -## 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 -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 - -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||" ` -done -md5sum ${FTPDIR}/Daily_HEAD/wx* > ${FTPDIR}/Daily_HEAD/MD5SUM -sleep 10 -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_svn -regenerate_makefiles -package_makefiles - - -add_win_files - -copy_files - -exit 0 diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh deleted file mode 100755 index 409953c432..0000000000 --- a/distrib/scripts/pre-flight.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -if [ "$VERSION" = "" ]; then - echo "Including build-environ.cfg" - . `dirname $0`/build-environ.cfg -fi - -# first, grab the latest revision with specified tag -if [ ! -d $WX_TEMP_DIR ]; then - mkdir $WX_TEMP_DIR -fi - -# just do an update if we started a build but it failed somewhere -if [ ! -d $WX_WEB_DIR ]; then - cd $WX_TEMP_DIR - echo "Grabbing wxWebSite sources..." - svn co https://svn.wxwidgets.org/svn/wxWebSite/trunk wxWebSite -else - cd $WX_WEB_DIR - svn cleanup - svn up -fi - -if [ ! -d $WX_SRC_DIR ]; then - cd $WX_TEMP_DIR - echo "Grabbing wx CVS with tag $BUILD_TAG" - svn co https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk/ wxWidgets - cd $WX_SRC_DIR -else - cd $WX_SRC_DIR - svn cleanup - svn up -fi - -# this is where we will store the wxAll tarball we create -if [ ! -d $DIST_DIR ]; then - mkdir -p $DIST_DIR -fi -echo saving to $DIST_DIR - -#re-bake the bakefiles -if [ $rebake = "yes" ]; then - if [ ! -d $WX_SRC_DIR/build/bakefiles ]; then - mkdir $WX_SRC_DIR/build/bakefiles - fi - - cd $WX_SRC_DIR/build/bakefiles - # always rebuild the bakefiles to avoid conflicts with cvs - ## better to not use unix2dos on the wxWidgets tree so we don't get the conflicts - ##fix this -B gave an option not recognised error (sf bug 1537221)... - rm .ba* - bakefile_gen -fi - -# Now generate the mega tarball with everything. We will push this to our build machines. -cd $WX_TEMP_DIR -export APPDIR=$WX_TEMP_DIR/wxWidgets -export WXWIN=$WX_TEMP_DIR/wxWidgets -export VERSION=$BUILD_VERSION -export SCRIPTDIR=${SCRIPTDIR} -export DIST_DIR=${DIST_DIR} - -#remove old files -rm -rf $APPDIR/deliver/* -rm -rf $DIST_DIR/* - -tar czf $DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR - -cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts -chmod +x $APPDIR/distrib/scripts/create_archives.sh -$APPDIR/distrib/scripts/create_archives.sh --wxall --wxmsw - -echo "Tarballs located at: $DIST_DIR" - -if [ ! -f $WX_TARBALL ]; then - echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue." - exit 1 -else - cd $DIST_DIR - #cp $WX_TARBALL $STAGING_DIR - #cp -r $WX_WEB_DIR $STAGING_DIR - - echo "Pre-flight complete. Ready for takeoff." -fi - -if [ "$KIND" = "daily" ]; then - ##delete old files and then copy new ones, add a symlink - find ${FTPDIR}/files -type f -name wx\* -mtime +6 | xargs rm -rf - cp $DIST_DIR/wx* ${FTPDIR}/files - - rm -f ${FTPDIR}/wx* ${FTPDIR}/MD5SUM - for f in `find ${FTPDIR}/files -type f -name wx\* -mmin -601` ; do - ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" ` - done -else - ## not a daily build - ##get install.txt files etc - ##.../docs/plat/install.txt goes to install-plat-2.7.0.txt - ## wince has a file down one dir - cp ${DOCDIR}/changes.txt $DIST_DIR/changes-${BUILD_VERSION}.txt - - for f in `find ${DOCDIR} -name install.txt` ; do - cp $f $DIST_DIR/install-`echo $f | sed -e "s|${DOCDIR}||g" | sed -e "s|/install.txt||g"`-${BUILD_VERSION}.txt - done - - for g in `find ${DOCDIR} -name readme.txt` ; do - cp $g $DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt - done - # Rename double readme - mv $DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $DIST_DIR/readme-${BUILD_VERSION}.txt - ## copy files ... - mkdir ${FTPDIR}/ - cp $DIST_DIR/* ${FTPDIR}/ - -fi - -md5sum ${FTPDIR}/wx* > ${FTPDIR}/MD5SUM - -## make sure updated at is really last -sleep 10 -echo svn checkout done at `date -u` > ${FTPDIR}/updated_at.txt - -echo "Delivery complete. Flying."