update to 2.7.1-rc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-09 08:43:47 +00:00
parent e7dd76568b
commit 6dc001c8bd
2 changed files with 5 additions and 1 deletions
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -48,6 +48,10 @@ fi
 #re-bake the bakefiles
 if [ $rebake = "yes" ]; then
  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