build tweaks, also drop most Python 2.3 builds

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

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index 2d005d13740514f03367b16d00f4980d8c29ca89..373d788a7cf7cded8a0c03379d5f1e6b1b983964 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -49,8 +49,8 @@ def getTasks(config_env):
     # on the nature of the build machines configurations...) is a separate
     # task.
     
     # on the nature of the build machines configurations...) is a separate
     # task.
     

-    jaguarTask = Task( Job("whopper.23", "distrib/all/build-osx",
-                           [config.OSX_HOST_jaguar, "2.3", "ansi"], env=config_env) )
+##     jaguarTask = Task( Job("whopper.23", "distrib/all/build-osx",
+##                            [config.OSX_HOST_jaguar, "2.3", "ansi"], env=config_env) )

     
     pantherTask = Task( [ Job("bigmac.23", 
                               "distrib/all/build-osx",
     
     pantherTask = Task( [ Job("bigmac.23", 
                               "distrib/all/build-osx",


@@ -73,21 +73,22 @@ def getTasks(config_env):
 
     
     beastTask1 = Task(
 
     
     beastTask1 = Task(

-        [ Job("beast.23",     "distrib/all/build-windows", ["2.3"], env=config_env),
-          Job("co-rh9.23",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.3"], env=config_env),
+        [ #Job("beast.23",     "distrib/all/build-windows", ["2.3"], env=config_env),
+#          Job("co-rh9.23",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.3"], env=config_env),

           Job("beast.24",     "distrib/all/build-windows", ["2.4"], env=config_env),
           Job("beast.24",     "distrib/all/build-windows", ["2.4"], env=config_env),

-          Job("co-rh9.24",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.4"], env=config_env),
+#          Job("co-rh9.24",    "distrib/all/build-rpm", ["beast", "co-rh9",   "rh9",   "2.4"], env=config_env),

           Job("beast.25",     "distrib/all/build-windows", ["2.5"], env=config_env),
           Job("beast.25",     "distrib/all/build-windows", ["2.5"], env=config_env),

+          Job("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),

           ])
     
     beastTask2 = Task(
           ])
     
     beastTask2 = Task(

-        [ Job("co-fc2.23",    "distrib/all/build-rpm", ["beast", "co-fc2",     "fc2",     "2.3"], env=config_env),
+        [ #Job("co-fc2.23",    "distrib/all/build-rpm", ["beast", "co-fc2",     "fc2",     "2.3"], env=config_env),

           Job("co-fc4.24",    "distrib/all/build-rpm", ["beast", "co-fc4",     "fc4",     "2.4"], env=config_env),
           Job("co-mdk102.24", "distrib/all/build-rpm", ["beast", "co-mdk102",  "mdk102",  "2.4"], env=config_env),
           Job("co-fc4.24",    "distrib/all/build-rpm", ["beast", "co-fc4",     "fc4",     "2.4"], env=config_env),
           Job("co-mdk102.24", "distrib/all/build-rpm", ["beast", "co-mdk102",  "mdk102",  "2.4"], env=config_env),

-          Job("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),
+#          Job("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),

           ])
 
           ])
 

-    buildTasks = [ jaguarTask,
+    buildTasks = [ #jaguarTask,

                    pantherTask,
                    tigerTask,
                    beastTask1,
                    pantherTask,
                    tigerTask,
                    beastTask1,

diff --git a/wxPython/distrib/all/build-finalize b/wxPython/distrib/all/build-finalize
index 1eddedd615ba9b9195c5535e26e823eb14a3058a..0f3c6549e5a4892a9f9ab879f2709a68618a4365 100755 (executable)
--- a/wxPython/distrib/all/build-finalize
+++ b/wxPython/distrib/all/build-finalize
@@ -26,7 +26,7 @@ if [ $KIND = daily ]; then
        echo "Copying to the starship at $destdir..."
        ssh $UPLOAD_HOST "mkdir -p $destdir"
        scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
        echo "Copying to the starship at $destdir..."
        ssh $UPLOAD_HOST "mkdir -p $destdir"
        scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir

-       ssh $UPLOAD_HOST "cd $destdir && ls -al"
+       #ssh $UPLOAD_HOST "cd $destdir && ls -al"

 
 
         # TODO: something to remove old builds from starship, keeping 
 
 
         # TODO: something to remove old builds from starship, keeping 

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index 3d21e5a7c6e9dece117d97d11a6b05d9a5e6c063..bd0fc32e7762450a061940e50dade3afe6ba54d4 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -28,6 +28,7 @@ lcport=gtk
 unicode=0
 tarname=wxPython-src
 srpmonly=0
 unicode=0
 tarname=wxPython-src
 srpmonly=0

+skipclean=0

 
 #----------------------------------------------------------------------
 # Check parameters
 
 #----------------------------------------------------------------------
 # Check parameters