X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc5bee0a1522852cdbe3c87a7f8cbfd43cbb4e58..67be49eec662508cef58c30a2214044d1249a579:/wxPython/distrib/all/build-rpm

diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm
index f53be94cdc..d04f25ba70 100755
--- a/wxPython/distrib/all/build-rpm
+++ b/wxPython/distrib/all/build-rpm
@@ -3,17 +3,16 @@
 
 set -o errexit
 
-# read the config variables from the file given on the command line
-. $1
 
-coHost=$2
-host=$3
-reltag=$4
-shift;shift;shift;shift
-pyver=$@
+coHost=$1
+host=$2
+reltag=$3
+pyver=$4
 
-if [ $pyver = config ]; then
-    pyver=$PYVER
+if [ $buildansi = yes ]; then
+    CHARTYPE=both
+else
+    CHARTYPE=unicode
 fi
 
 
@@ -39,14 +38,14 @@ if [ $skiplinux != yes ]; then
 	hostAvailable=yes
     else
 	# Attempt to start the host via it's coLinux host, if there is one
-	if [ $coHost != none ]; then 
+	if [ $coHost != none -a $startcohost == yes ]; then 
 	    if TestOnline $coHost; then
 		echo "Attempting to start $host via coLinux on $coHost..."
 		ssh $coHost "/c/coLinux/VMs/$host.bat -d > /dev/null 2>&1 &"
 
 		# Give it time to boot and be ready for conenctions,
 		# and then test with ssh, limiting retries.
-		for x in `seq 12`; do
+		for x in `seq 36`; do
 		    sleep 5
 		    echo "checking..."
 		    if ssh root@$host "true" >/dev/null 2>&1; then
@@ -83,7 +82,7 @@ if [ $skiplinux != yes ]; then
     
     echo "Running build script on $host..."
     cmd=./do-build-rpm
-    ssh root@$host "cd $LINUX_BUILD && $cmd $reltag $skipclean $VERSION $pyver"
+    ssh root@$host "cd $LINUX_BUILD && $cmd $reltag $skipclean $VERSION $pyver $CHARTYPE"
     
     echo "Fetching the results..."
     scp "root@$host:$LINUX_BUILD/wxPython*.i[0-9]86.rpm"  $STAGING_DIR
@@ -95,4 +94,8 @@ if [ $skiplinux != yes ]; then
 	ssh root@$host "/sbin/halt"
 	sleep 10
     fi
+    sleep 30
+
+    echo "Done!"
 fi
+