fixes for York delivery

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

diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index e2073c7c976feb36f6c1572138542c94626c1d8e..7fcfa59fee5cccc2bfe069e88cb031879ae325bc 100644 (file)
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -2,19 +2,6 @@
 # build environment settings. If you want to make considerable changes, then
 # you should create your own settings file and specify that to create-release.sh.
 
 # build environment settings. If you want to make considerable changes, then
 # you should create your own settings file and specify that to create-release.sh.
 

-# host name of the machine to use for windows builds
-WIN_HOST=192.168.1.104
-
-# Where is the build dir from the remote machine's perspective?
-WIN_BUILD=/cygdrive/c/wx2dev
-
-LINUX_HOST=192.168.1.105
-
-LINUX_BUILD=~/wx2dev
-
-MAC_HOST=192.168.1.103
-
-MAC_BUILD=~/wx2dev

 
 # the local spot that we put everything when done, before possibly copying 
 # to remote hosts
 
 # the local spot that we put everything when done, before possibly copying 
 # to remote hosts


@@ -26,23 +13,23 @@ DIST_DIR=../deliver
 # directory to store the wx tree we pull from CVS
 WX_TEMP_DIR=/tmp/wx-temp
 
 # directory to store the wx tree we pull from CVS
 WX_TEMP_DIR=/tmp/wx-temp
 

+CURDATE=`date -I`
+

 # build info
 # build info

-BUILD_VERSION=2.7.0
+BUILD_VERSION=2.7.0-rc

 BUILD_TAG=HEAD
 
 BUILD_TAG=HEAD
 

-KIND=daily
-
-### Windows defines ###
-
-# so we can setup the Windows dev environment if it is not already done
-MSVS7_DIR="C:/Program Files/Microsoft Visual Studio 2003"
-NET_FrameworkDir="C:/Windows/Microsoft.NET/Framework"

 
 

-MSVS6_DIR="C:/Program Files/Microsoft Visual Studio"
-MSPSDK_DIR="C:/Program Files/Microsoft Platform SDK"
-
-### End Windows defines ###
+if [ "$KIND" = "release" ]; then
+   FTPDIR=/home/ftp/pub/${BUILD_VERSION}
+else
+   KIND=daily
+   BUILD_VERSION=${CURDATE}
+   FTPDIR=/home/ftp/pub/CVS_HEAD/v2
+fi

 
 

+echo "Building for ${BUILD_VERSION}"
+               

 # Default build settings
 skipwin=no
 skipmac=no
 # Default build settings
 skipwin=no
 skipmac=no


@@ -53,4 +40,5 @@ setup_msvc_for_cygwin=yes
 rebake=yes
 
 # If building is successful, delete temp files?
 rebake=yes
 
 # If building is successful, delete temp files?

-delete_temps=no
\ No newline at end of file
+delete_temps=no
+

diff --git a/distrib/scripts/pre-flight.sh b/distrib/scripts/pre-flight.sh
index 08cb45b45b61ebf34f607cb4f24971db8e6fb633..081dff88a157bf6bc255a1772c297fa2adba8405 100755 (executable)
--- a/distrib/scripts/pre-flight.sh
+++ b/distrib/scripts/pre-flight.sh
@@ -10,6 +10,8 @@ echo "$WX_TEMP_DIR"
 START_DIR="$PWD"
 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets
 START_DIR="$PWD"
 WX_WEB_DIR=$WX_TEMP_DIR/wxWebSite
 WX_SRC_DIR=$WX_TEMP_DIR/wxWidgets

+FTPDIR=/home/ftp/pub/CVS_HEAD/v2
+CURDATE=`date -I`

 
 # first, grab the latest revision with specified tag
 if [ ! -d $WX_TEMP_DIR ]; then
 
 # first, grab the latest revision with specified tag
 if [ ! -d $WX_TEMP_DIR ]; then


@@ -69,6 +71,7 @@ chmod +x $APPDIR/distrib/scripts/create_archives.sh
 $APPDIR/distrib/scripts/create_archives.sh --all
 
 # copy all the archives we created to the master machine's deliver directory
 $APPDIR/distrib/scripts/create_archives.sh --all
 
 # copy all the archives we created to the master machine's deliver directory

+rm -rf $START_DIR/$DIST_DIR/*

 cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.zip $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.gz $START_DIR/$DIST_DIR
 cp $APPDIR/deliver/*.tar.bz2 $START_DIR/$DIST_DIR


@@ -85,3 +88,26 @@ else
   
   echo "Pre-flight complete. Ready for takeoff."
 fi
   
   echo "Pre-flight complete. Ready for takeoff."
 fi

+
+if [ "$KIND" = "daily" ]; then
+   ##delete old files and then copy new ones, add a symlink
+   find ${FTPDIR}/files -type f -name wx\* -mtime +6 | xargs rm -rf
+   cp  $START_DIR/$DIST_DIR/wx* ${FTPDIR}/files
+
+   rm -f ${FTPDIR}/wx* ${FTPDIR}/MD5SUM
+   for f in `find ${FTPDIR}/files -type f -name wx\* -mmin -601` ; do
+      ln -s $f `echo $f | sed -e "s/-${CURDATE}//" | sed -e "s|/files||" `
+   done
+else
+   ## not a daily build
+   mkdir ${FTPDIR}/
+   cp  $START_DIR/$DIST_DIR/wx* ${FTPDIR}/
+fi
+
+md5sum ${FTPDIR}/wx* > ${FTPDIR}/MD5SUM
+
+## make sure updated at is really last
+sleep 10
+echo cvs checkout done at  date -u > ${FTPDIR}/updated_at.txt
+       
+echo "Delivery complete. Flying."