From 6ca744908a7e05e3c851443b71f16b069f2d83f1 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 7 Dec 2006 21:03:45 +0000
Subject: [PATCH] minor build tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/distrib/all/build-deb         | 2 +-
 wxPython/distrib/all/build-environ.cfg | 8 +++++---
 wxPython/distrib/all/build-finalize    | 8 ++++----
 wxPython/distrib/all/do-build-deb      | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/wxPython/distrib/all/build-deb b/wxPython/distrib/all/build-deb
index 0686fb2879..6bfc3f9315 100755
--- a/wxPython/distrib/all/build-deb
+++ b/wxPython/distrib/all/build-deb
@@ -23,7 +23,7 @@ function TestOnline {
 
 
 if [ $skipdeb != yes ]; then
-    # We use a chroot environment on th elocal machine for the debian
+    # We use a chroot environment on the build machine for the debian
     # builds, so this build is pretty simple.  Just copy the tarball
     # and a build script to /tmp, and then run do-build-deb in the
     # chroot.
diff --git a/wxPython/distrib/all/build-environ.cfg b/wxPython/distrib/all/build-environ.cfg
index df59f673ea..e506f31c6c 100644
--- a/wxPython/distrib/all/build-environ.cfg
+++ b/wxPython/distrib/all/build-environ.cfg
@@ -24,15 +24,17 @@ LINUX_BUILD = /tmp/BUILD
 
 # Upload server locations
 #UPLOAD_HOST = starship.python.net
+#UPLOAD_USER = robind
 #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_USER = wxpython
+UPLOAD_PREVIEW_ROOT = /var/www/vhosts/wxcommunity.com/subdomains/wxpython/httpdocs/preview
+UPLOAD_RELEASE_ROOT = /var/www/vhosts/wxcommunity.com/subdomains/wxpython/httpdocs/release
+UPLOAD_METHOD = ssh
 UPLOAD_URL_ROOT = http://wxPython.wxcommunity.com/
 
 
diff --git a/wxPython/distrib/all/build-finalize b/wxPython/distrib/all/build-finalize
index ba10bdfdc1..5b56d1edee 100755
--- a/wxPython/distrib/all/build-finalize
+++ b/wxPython/distrib/all/build-finalize
@@ -25,8 +25,8 @@ if [ $KIND = daily ]; then
 	destdir=$UPLOAD_PREVIEW_ROOT/$DAILY
 	echo "Copying to $UPLOAD_HOST at $destdir..."
 	if [ $UPLOAD_METHOD = ssh ]; then
-	    ssh $UPLOAD_HOST "mkdir -p $destdir"
-	    scp -pr $STAGING_DIR/* $UPLOAD_HOST:/$destdir
+	    ssh $UPLOAD_USER@$UPLOAD_HOST "mkdir -p $destdir"
+	    scp -pr $STAGING_DIR/* $UPLOAD_USER@$UPLOAD_HOST:/$destdir
 	fi
 	if [ $UPLOAD_METHOD = ftp ]; then
 	    lftp -c "open $UPLOAD_HOST; mkdir $destdir"
@@ -79,8 +79,8 @@ if [ $KIND = release ]; then
 	echo "Copying to $UPLOAD_HOST..."
 	destdir=$UPLOAD_RELEASE_ROOT/$VERSION
 	if [ $UPLOAD_METHOD = ssh ]; then
-	    ssh $UPLOAD_HOST "mkdir -p $destdir"
-	    scp -pr $STAGING_DIR/* $UPLOAD_HOST:/$destdir
+	    ssh $UPLOAD_USER@$UPLOAD_HOST "mkdir -p $destdir"
+	    scp -pr $STAGING_DIR/* $UPLOAD_USER@$UPLOAD_HOST:/$destdir
 	fi
 	if [ $UPLOAD_METHOD = ftp ]; then
 	    lftp -c "open $UPLOAD_HOST; mkdir $destdir"
diff --git a/wxPython/distrib/all/do-build-deb b/wxPython/distrib/all/do-build-deb
index 6c9c37058d..329f599c99 100755
--- a/wxPython/distrib/all/do-build-deb
+++ b/wxPython/distrib/all/do-build-deb
@@ -2,7 +2,7 @@
 # ---------------------------------------------------------------------------
 
 set -o errexit
-set -o xtrace
+#set -o xtrace
 
 echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
 
-- 
2.45.2