From 2dc98635846c6edd1f3b58ece3eb13753ed0607d Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Tue, 28 Aug 2007 08:06:33 +0000
Subject: [PATCH] 2.8.5-rc3

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/scripts/build-environ.cfg | 3 ++-
 distrib/scripts/pre-flight.sh     | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 8b36b3fbe8..a7a758a072 100644
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -12,12 +12,13 @@ DIST_DIR=../deliver
 
 # directory to store the wx tree we pull from CVS
 WX_TEMP_DIR=/tmp/wx-temp28
+mkdir ${WX_TEMP_DIR}
 DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 
 CURDATE=`date -I`
 
 # build info
-BUILD_VERSION=2.8.5-rc1
+BUILD_VERSION=2.8.5-rc3
 BUILD_TAG=HEAD
 
 
diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 040a95d0ed..7e5fb24fed 100755
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -2,13 +2,13 @@
 
 if [ "$VERSION" = "" ]; then
     echo "Including build-environ.cfg"
-    . scripts/build-environ.cfg
+    . scripts28/build-environ.cfg
 fi 
 
 echo "temp dir is $WX_TEMP_DIR"
 
 START_DIR="$PWD"
-SCRIPTDIR=${START_DIR}/scripts
+SCRIPTDIR=${START_DIR}/scripts28
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 
 CURDATE=`date -I`
@@ -24,10 +24,11 @@ cd $WX_TEMP_DIR
 if [ ! -d $WX_SRC_DIR ]; then
   cd $WX_TEMP_DIR
   echo "Grabbing wx CVS with tag $BUILD_TAG"
-  svn up https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH/ wxWidgets
+  svn co https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH/ wxWidgets
   cd $WX_SRC_DIR
 else
     cd $WX_SRC_DIR
+    svn cleanup
     svn up
 fi
 #copy setup0.h setup.h for msw