some more operator?! tests

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

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index f2482948f6389941907c29055c07afe596b3869e..1a80a7cf497215fc83178c47653154a6c9fb33bb 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -2,12 +2,13 @@
 
 if [ "$VERSION" = "" ]; then
     echo "Including build-environ.cfg"
-    . scripts/build-environ.cfg
+    . `dirname $0`/build-environ.cfg
 fi 
 
 echo "temp dir is $WX_TEMP_DIR"
-
 START_DIR="$PWD"
+echo "start dir is $START_DIR"
+
 SCRIPTDIR=${START_DIR}/scripts
 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
@@ -28,7 +29,7 @@ if [ ! -d $WX_WEB_DIR ]; then
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxWebSite
 else
     cd $WX_WEB_DIR
-    cvs update -d
+    cvs update -d -P
 fi
 
 if [ ! -d $WX_SRC_DIR ]; then
@@ -36,10 +37,14 @@ if [ ! -d $WX_SRC_DIR ]; then
   cvs -d:pserver:anoncvs:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets login
   echo "Grabbing wx CVS with tag $BUILD_TAG"
   cvs -d:pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout -r $BUILD_TAG wxWidgets
+  cd $WX_SRC_DIR
 else
     cd $WX_SRC_DIR
-    cvs update -d
+    cvs update -d -P
 fi
+#copy setup0.h setup.h for msw
+rm include/wx/msw/setup.h
+cp include/wx/msw/setup0.h include/wx/msw/setup.h
 
 # this is where we will store the wxAll tarball we create
 if [ ! -d $START_DIR/$DISTDIR ]; then
@@ -126,6 +131,8 @@ else
    for g in `find ${DOCDIR} -name readme.txt` ; do
      cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
    done
+   # Rename double readme
+   mv $START_DIR/$DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
    ## copy files ...
    mkdir ${FTPDIR}/
    cp  $START_DIR/$DIST_DIR/* ${FTPDIR}/