No animate contrib anymore

[wxWidgets.git] / wxPython / distrib / all / build-rpm

diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm
index 66e9afaed7ba785b8d768eb95b9276899ea2fb83..4542dd7e3d71e7f9e0d14b4d15bbfed5a3a736f6 100755 (executable)
--- 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
 
 
@@ -29,7 +28,7 @@ function TestOnline {
 }
 
 
-if [ $skiplinux != yes ]; then
+if [ $skiprpm != yes ]; then
 
     startedCoHost=no
     hostAvailable=no
@@ -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
+