From 6dc001c8bd6473db7f29dcef70098131c8ede1ba Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 9 Aug 2006 08:43:47 +0000 Subject: [PATCH] update to 2.7.1-rc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/scripts/build-environ.cfg | 2 +- distrib/scripts/pre-flight.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg index 080589ba2c..223de79366 100644 --- 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 630bd70fe1..41f6988314 100755 --- 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 -- 2.45.2