X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d54dc7cd6eb2e922723b65e4ce3c813d313045b..1af80955631e480970a7a6a097fe27e2b1303aa7:/distrib/scripts/pre-flight.sh

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 27cf72be35..83ef6910c1 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -5,9 +5,10 @@ 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
 
@@ -27,17 +28,22 @@ if [ ! -d $WX_WEB_DIR ]; then
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
 else
     cd $WX_WEB_DIR
-    cvs update -d
+    cvs update -d -P
 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
+  cd $WX_SRC_DIR
 else
     cd $WX_SRC_DIR
-    cvs update -d
+    cvs update -d -P
 fi
+#copy setup0.h setup.h for msw
+find . -name setup.h | xargs rm -rf
+cp include/wx/msw/setup0.h include/wx/msw/setup.h
 
 # this is where we will store the wxAll tarball we create
 if [ ! -d $START_DIR/$DISTDIR ]; then
@@ -46,7 +52,15 @@ 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
 
@@ -61,22 +75,26 @@ 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
 
 # copy all the archives we created to the master machine's deliver directory
-rm -rf $START_DIR/$DIST_DIR/*
 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."
@@ -112,6 +130,8 @@ else
    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
+   # Rename double readme
+   mv $START_DIR/$DIST_DIR/readme-readme-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
    ## copy files ...
    mkdir ${FTPDIR}/
    cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/
@@ -122,6 +142,6 @@ 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 cvs checkout done at  `date -u` > ${FTPDIR}/updated_at.txt
        
 echo "Delivery complete. Flying."