Fix for assert in setting image from file by Jaakko Salli.

[wxWidgets.git] / distrib / scripts / pre-flight.sh

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 27cf72be353084d77f5caeae155e3d9e0196577f..5074f8ec8f9c53eb5d826dea69321ef3114f9e56 100755 (executable)
--- 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
 
@@ -31,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
@@ -46,7 +48,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 +71,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."