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 c98abe08ad9efd954e6578e26de1b046f32dd3b5..5074f8ec8f9c53eb5d826dea69321ef3114f9e56 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -5,7 +5,7 @@ if [ "$VERSION" = "" ]; then
     . scripts/build-environ.cfg
 fi 
 
     . scripts/build-environ.cfg
 fi 
 

-echo "$WX_TEMP_DIR"
+echo "temp dir is $WX_TEMP_DIR"

 
 START_DIR="$PWD"
 SCRIPTDIR=${START_DIR}/scripts
 
 START_DIR="$PWD"
 SCRIPTDIR=${START_DIR}/scripts


@@ -32,6 +32,7 @@ else
 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
 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
   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


@@ -47,8 +48,16 @@ fi
 
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
 
 #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
   cd $WX_SRC_DIR/build/bakefiles

-  bakefile_gen -d ${WX_SRC_DIR}/distrib/scripts/Bakefiles.release.bkgen
+  # 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
 
 cd $WX_SRC_DIR
 fi
 
 cd $WX_SRC_DIR


@@ -68,7 +77,8 @@ export SCRIPTDIR=${SCRIPTDIR}
 rm -rf $APPDIR/deliver/*
 rm -rf $START_DIR/$DIST_DIR/*
 
 rm -rf $APPDIR/deliver/*
 rm -rf $START_DIR/$DIST_DIR/*
 

-tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz `basename $APPDIR`
+
+tar czf $START_DIR/$DIST_DIR/wxWidgets-snapshot-$BUILD_VERSION.tar.gz $WX_TEMP_DIR

 
 #export DESTDIR=$STAGING_DIR
 cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts
 
 #export DESTDIR=$STAGING_DIR
 cp $SCRIPTDIR/create_archives.sh $APPDIR/distrib/scripts