upload to wxpython.wxcommunity.com instead of starship

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

diff --git a/wxPython/distrib/all/build-environ.cfg b/wxPython/distrib/all/build-environ.cfg
index f04856678a75f5b297210ee6cea1c8a4bdb3b1e5..c0332e56f4957bb921bbb8bb8da0ac4a71e68f89 100644 (file)
--- a/wxPython/distrib/all/build-environ.cfg
+++ b/wxPython/distrib/all/build-environ.cfg
@@ -23,9 +23,18 @@ LINUX_BUILD = /tmp/BUILD
 
 
 # Upload server locations
-UPLOAD_HOST = starship.python.net
-UPLOAD_DAILY_ROOT = /home/crew/robind/public_html/wxPython/daily
-UPLOAD_PREVIEW_ROOT = /home/crew/robind/public_html/wxPython/rc
+#UPLOAD_HOST = starship.python.net
+#UPLOAD_PREVIEW_ROOT = /home/crew/robind/public_html/wxPython/preview
+#UPLOAD_RELEASE_ROOT = /home/crew/robind/public_html/wxPython/release
+#UPLOAD_METHOD = ssh
+#UPLOAD_URL_ROOT = http://starship.python.net/crew/robind/wxPython/
+
+UPLOAD_HOST = wxpython.wxcommunity.com
+UPLOAD_PREVIEW_ROOT = /httpdocs/preview
+UPLOAD_RELEASE_ROOT = /httpdocs/release
+UPLOAD_METHOD = ftp
+UPLOAD_URL_ROOT = http://wxPython.wxcommunity.com/
+
 
 # defaults for build options
 KIND = dryrun

diff --git a/wxPython/distrib/all/build-finalize b/wxPython/distrib/all/build-finalize
index 0f3c6549e5a4892a9f9ab879f2709a68618a4365..2666b7f5d9c73c08db1ecc637a6a512e33e1f208 100755 (executable)
--- a/wxPython/distrib/all/build-finalize
+++ b/wxPython/distrib/all/build-finalize
@@ -22,12 +22,16 @@ if [ $KIND = daily ]; then
     cp $STAGING_DIR/* $destdir
 
     if [ $skipupload != yes ]; then 
-       destdir=$UPLOAD_DAILY_ROOT/$DAILY
-       echo "Copying to the starship at $destdir..."
-       ssh $UPLOAD_HOST "mkdir -p $destdir"
-       scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
-       #ssh $UPLOAD_HOST "cd $destdir && ls -al"
-
+       destdir=$UPLOAD_PREVIEW_ROOT/$DAILY
+       echo "Copying to $UPLOAD_HOST at $destdir..."
+       if [ $UPLOAD_METHOD = ssh ]; then
+           ssh $UPLOAD_HOST "mkdir -p $destdir"
+           scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
+       fi
+       if [ $UPLOAD_METHOD = ftp ]; then
+           lftp -c "open $UPLOAD_HOST; mkdir $destdir"
+           lftp -c "open $UPLOAD_HOST; cd $destdir; mput $STAGING_DIR/*"
+       fi
 
         # TODO: something to remove old builds from starship, keeping 
         # only N days worth
@@ -44,11 +48,11 @@ Date: $DATE
 
 Hi,
 
-A new test build of wxPython has been uploaded to starship.  
+A new test build of wxPython has been uploaded.  
 
    Version: $VERSION
-   URL:     http://starship.python.net/crew/robind/wxPython/daily/$DAILY
-   Changes: http://starship.python.net/crew/robind/wxPython/daily/$DAILY/CHANGES.html
+   URL:     $UPLOAD_URL_ROOT/preview/$DAILY
+   Changes: $UPLOAD_URL_ROOT/preview/$DAILY/CHANGES.html
 
 Have fun!
 R'bot
@@ -72,10 +76,16 @@ if [ $KIND = release ]; then
     cp $STAGING_DIR/* $destdir
 
     if [ $skipupload != yes ]; then 
-       echo "Copying to the starship..."
-       destdir=$UPLOAD_PREVIEW_ROOT/$VERSION
-       ssh $UPLOAD_HOST "mkdir -p $destdir"
-       scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
+       echo "Copying to $UPLOAD_HOST..."
+       destdir=$UPLOAD_RELEASE_ROOT/$VERSION
+       if [ $UPLOAD_METHOD = ssh ]; then
+           ssh $UPLOAD_HOST "mkdir -p $destdir"
+           scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
+       fi
+       if [ $UPLOAD_METHOD = ftp ]; then
+           lftp -c "open $UPLOAD_HOST; mkdir $destdir"
+           lftp -c "open $UPLOAD_HOST; cd $destdir; mput $STAGING_DIR/*"
+       fi
 
         # Send email to wxPython-dev
        DATE=`date`
@@ -92,8 +102,8 @@ Hi,
 A new RC build of wxPython has been uploaded to starship.  
 
    Version: $VERSION
-   URL:     http://starship.python.net/crew/robind/wxPython/rc/$VERSION
-   Changes: http://starship.python.net/crew/robind/wxPython/rc/$VERSION/CHANGES.html
+   URL:     $UPLOAD_URL_ROOT/release/$VERSION
+   Changes: $UPLOAD_URL_ROOT/release/$VERSION/CHANGES.html
 
 Have fun!
 R'bot