From: Robin Dunn <robin@alldunn.com>
Date: Sun, 21 Jan 2007 07:03:55 +0000 (+0000)
Subject: Build and distrib tweaks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a0d5472b1bd48a1e6cabb580fcc8864e0d7ccf59?ds=sidebyside;hp=6caa0f5cd18fe9fb39c207d5f31fa5633479a822

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 056f9add42..fda836feca 100755
--- 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*"
+     ssh $WIN_HOST "rm -rf $WIN_BUILD/*"
 
      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 050b6e3051..ff85fbc6ab 100755
--- 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..."
-    rm -r $WXDIR || true
+    rm -fr $WXDIR || true
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"
diff --git a/wxPython/distrib/all/taskrunner.py b/wxPython/distrib/all/taskrunner.py
index 5ed84826c5..ee3151e0e1 100644
--- 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()
-                            print "JOB RETURNED FAILURE CODE! (%d)" % rc
+                            print "'%s' JOB RETURNED FAILURE CODE! (%d)" % (job.label, rc)
                             self.rc = rc
                             self.stopAllJobs()
                             return rc
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index bf1a3fbc73..7811ed1432 100644
--- 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\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";