Build and distrib tweaks

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

diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows
index 056f9add422faf0777b681f6ebd66fab54b32fd6..fda836feca1a05b02307dd7f31314b4c9180be43 100755 (executable)
--- a/wxPython/distrib/all/build-windows
+++ b/wxPython/distrib/all/build-windows
@@ -36,6 +36,7 @@ if [ $skipwin != yes ]; then
      echo "Fetching the results..."
      scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*"  $STAGING_DIR
      ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"
      echo "Fetching the results..."
      scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*"  $STAGING_DIR
      ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"

+     ssh $WIN_HOST "rm -rf $WIN_BUILD/*"

 
      echo "Done!"
 fi
\ No newline at end of file
 
      echo "Done!"
 fi
\ No newline at end of file

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index 050b6e30512be791aed0df137fcb95e6a09d6826..ff85fbc6ab2e76b5691efc4aef3dd9d61ea84802 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -164,7 +164,7 @@ cd $DESTDIR
 
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
 
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."

-    rm -r $WXDIR || true
+    rm -fr $WXDIR || true

 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"

diff --git a/wxPython/distrib/all/taskrunner.py b/wxPython/distrib/all/taskrunner.py
index 5ed84826c5e4a2492c2a2bf4a9f89474f5d88f72..ee3151e0e1abf8809b2117ed1d38154ba7d74eaa 100644 (file)
--- a/wxPython/distrib/all/taskrunner.py
+++ b/wxPython/distrib/all/taskrunner.py
@@ -229,7 +229,7 @@ class TaskRunner(object):
                     if job and job.finished():
                         if job.returnCode() != 0:
                             rc = job.returnCode()
                     if job and job.finished():
                         if job.returnCode() != 0:
                             rc = job.returnCode()

-                            print "JOB RETURNED FAILURE CODE! (%d)" % rc
+                            print "'%s' JOB RETURNED FAILURE CODE! (%d)" % (job.label, rc)

                             self.rc = rc
                             self.stopAllJobs()
                             return rc
                             self.rc = rc
                             self.stopAllJobs()
                             return rc

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index bf1a3fbc73575513fbbade315f36041f8375dc21..7811ed143247c7e12ef629c4dc5e67b805aeb217 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -202,6 +202,8 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo";

+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\art\*.pyc";
+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\art\*.pyo";

 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";