X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dfa1180b02ff64115f9ad96e270edea64027a3b..9654efd3327fcb6b6e3d8d803ea80f08904f1197:/distrib/scripts/pre-flight.sh?ds=sidebyside

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 41c62e608b..5074f8ec8f 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -5,12 +5,15 @@ if [ "$VERSION" = "" ]; then
     . scripts/build-environ.cfg
 fi 
 
-echo "$WX_TEMP_DIR"
+echo "temp dir is $WX_TEMP_DIR"
 
 START_DIR="$PWD"
+SCRIPTDIR=${START_DIR}/scripts
 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 
+CURDATE=`date -I`
+
 # first, grab the latest revision with specified tag
 if [ ! -d $WX_TEMP_DIR ]; then
   mkdir $WX_TEMP_DIR
@@ -29,6 +32,7 @@ else
 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
+  cd $WX_TEMP_DIR
   cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
   echo "Grabbing wx CVS with tag $BUILD_TAG"
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
@@ -38,13 +42,21 @@ else
 fi
 
 # this is where we will store the wxAll tarball we create
-if [ ! -d $DISTDIR ]; then
-  mkdir $DISTDIR
+if [ ! -d $START_DIR/$DISTDIR ]; then
+  mkdir -p $START_DIR/$DISTDIR
 fi
 
 #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 -d ../../distrib/scripts/Bakefiles.release.bkgen
 fi
 
@@ -59,12 +71,17 @@ cd $WX_TEMP_DIR
 export APPDIR=$WX_TEMP_DIR/wxWidgets
 export WXWIN=$WX_TEMP_DIR/wxWidgets
 export VERSION=$BUILD_VERSION
+export SCRIPTDIR=${SCRIPTDIR}
+
+#remove old files
 rm -rf $APPDIR/deliver/*
+rm -rf $START_DIR/$DIST_DIR/*
 
-tar czvf $START_DIR/$DIST_DIR/wxWidgets-$BUILD_VERSION-snapshot.tar.gz $APPDIR
+
+tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR
 
 #export DESTDIR=$STAGING_DIR
-cp $START_DIR/scripts/create_archives.sh $APPDIR/distrib/scripts
+cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts
 chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $APPDIR/distrib/scripts/create_archives.sh --all
 
@@ -73,7 +90,7 @@ cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR
 
-echo "Tarball located at: $WX_TARBALL"
+echo "Tarballs located at: $START_DIR/$DIST_DIR"
 
 if [ ! -f $WX_TARBALL ]; then
   echo "ERROR: wxAll tarball was not created by pre-flight.sh. Build cannot continue."
@@ -85,3 +102,40 @@ else
   
   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  $START_DIR/$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 $START_DIR/$DIST_DIR/changes-${BUILD_VERSION}.txt
+
+   for f in `find ${DOCDIR} -name install.txt` ; do
+     cp $f $START_DIR/$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 $START_DIR/$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
+   ## copy files ...
+   mkdir ${FTPDIR}/
+   cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/
+
+fi
+
+md5sum ${FTPDIR}/wx* > ${FTPDIR}/MD5SUM
+
+## make sure updated at is really last
+sleep 10
+echo cvs checkout done at  date -u > ${FTPDIR}/updated_at.txt
+       
+echo "Delivery complete. Flying."