update to 2.7.1-rc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 080589ba2c5db3c87428c2aabd1c4b58c013c28b..223de793662603cdd8a8cec2e86a5742318611ed 100644 (file)
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.7.0-rc
+BUILD_VERSION=2.7.1-rc
 BUILD_TAG=HEAD
 
 

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 630bd70fe14cc41bed53cccab66f0105cb2e7d1b..41f6988314f342bd846ab129c6a4fda25622343f 100755 (executable)
--- 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