STL build fix

[wxWidgets.git] / distrib / scripts / pre-flight.sh

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index fa9a17506a710181151c34d27597d1669d317685..42976a373a4290a27998027147bdcf9cbae564bd 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -13,23 +13,23 @@ fi
 # just do an update if we started a build but it failed somewhere
 if [ ! -d $WX_WEB_DIR ]; then  
   cd $WX_TEMP_DIR
 # just do an update if we started a build but it failed somewhere
 if [ ! -d $WX_WEB_DIR ]; then  
   cd $WX_TEMP_DIR

-  cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login

   echo "Grabbing wxWebSite sources..."
   echo "Grabbing wxWebSite sources..."

-  cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
+  svn co https://svn.wxwidgets.org/svn/wxWebSite/trunk wxWebSite

 else
     cd $WX_WEB_DIR
 else
     cd $WX_WEB_DIR

-####    cvs update -d -P
+    svn cleanup
+    svn up

 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
   cd $WX_TEMP_DIR
 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"
   echo "Grabbing wx CVS with tag $BUILD_TAG"

-  cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
+  svn co https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk/ wxWidgets

   cd $WX_SRC_DIR
 else
   cd $WX_SRC_DIR
   cd $WX_SRC_DIR
 else
   cd $WX_SRC_DIR

-####  cvs update -d -P
+  svn cleanup
+  svn up

 fi
 
 # this is where we will store the wxAll tarball we create
 fi
 
 # this is where we will store the wxAll tarball we create


@@ -49,7 +49,7 @@ if [ $rebake = "yes" ]; then
   ## 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*
   ## 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
+  bakefile_gen -d ../../distrib/scripts/Bakefiles.release.bkgen

 fi
 
 # Now generate the mega tarball with everything. We will push this to our build machines.
 fi
 
 # Now generate the mega tarball with everything. We will push this to our build machines.


@@ -118,6 +118,6 @@ md5sum ${FTPDIR}/wx* > ${FTPDIR}/MD5SUM
 
 ## make sure updated at is really last
 sleep 10
 
 ## make sure updated at is really last
 sleep 10

-echo cvs checkout done at  `date -u` > ${FTPDIR}/updated_at.txt
+echo svn checkout done at  `date -u` > ${FTPDIR}/updated_at.txt

        
 echo "Delivery complete. Flying."
        
 echo "Delivery complete. Flying."