a little whitespace cleanup

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

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index 1221be37ce2daec2578e6d9a13df8c8a110508cc..373d788a7cf7cded8a0c03379d5f1e6b1b983964 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -40,53 +40,59 @@ class Job(Job):
 def getTasks(config_env):
     # Things that need to be done before any of the builds
     initialTask = Task([
-        Job("cleanup", "distrib/all/build-setup", env=config_env),
-        Job("makedocs", "distrib/all/build-docs", env=config_env),
-        Job("maketarball", "distrib/all/build-sources", env=config_env),
+        Job("", "distrib/all/build-setup", env=config_env),
+        Job("", "distrib/all/build-docs", env=config_env),
+        Job("", "distrib/all/build-sources", env=config_env),
         ])
     
     # Build tasks.  Anything that can be done in parallel (depends greatly
     # 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, "jaguar", "2.3"], 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", [config.OSX_HOST_panther, "panther", "2.3"], env=config_env),
-          Job("bigmac.24",
-              "distrib/all/build-osx", [config.OSX_HOST_panther, "panther", "2.4"], env=config_env)
-          ])
+    pantherTask = Task( [ Job("bigmac.23", 
+                              "distrib/all/build-osx",
+                              [config.OSX_HOST_panther, "2.3", "both"], env=config_env),
+                          Job("bigmac.24",
+                              "distrib/all/build-osx",
+                              [config.OSX_HOST_panther, "2.4", "both"], env=config_env)
+                          ])
+
+    tigerTask =  Task([ #Job("smallfry.23",
+                        #    "distrib/all/build-osx",
+                        #    [config.OSX_HOST_tiger, "2.3", "both"], env=config_env),
+                        Job("smallfry.24",
+                            "distrib/all/build-osx",
+                            [config.OSX_HOST_tiger, "2.4", "both", "universal"], env=config_env),
+                        Job("smallfry.25",
+                            "distrib/all/build-osx",
+                            [config.OSX_HOST_tiger, "2.5", "both", "universal"], env=config_env)
+                    ])
+
     
     beastTask1 = Task(
-        [ Job("beast.23",     "distrib/all/build-windows", ["2.3"], env=config_env),
-          Job("co-rh9.23",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.3"]),
+        [ #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("co-rh9.24",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.4"]),
+#          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("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),
           ])
     
     beastTask2 = Task(
-        [ Job("co-fc2.23",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.3"]),
-          #Job("co-mdk101.23", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
-          Job("co-fc4.24",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc4",   "fc4",   "2.4"]),
-          #Job("co-fc2.24",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.4"]),
-          Job("co-mdk102.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk102","mdk102","2.4"]),
+        [ #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-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),
           ])
 
-##     cyclopsTask = Task(
-##         [ Job("co-mdk92.23",  "distrib/all/build-rpm", ["cyclops", "co-mdk92", "mdk92", "2.3"], env=config_env),
-##           Job("co-rh9.23",    "distrib/all/build-rpm", ["cyclops", "co-rh9",   "rh9",   "2.3"], env=config_env),
-##           Job("co-mdk92.24",  "distrib/all/build-rpm", ["cyclops", "co-mdk92", "mdk92", "2.4"], env=config_env),
-##           Job("co-rh9.24",    "distrib/all/build-rpm", ["cyclops", "co-rh9",   "rh9",   "2.4"], env=config_env),
-##           ])
-    
-    buildTasks = [ jaguarTask,
+    buildTasks = [ #jaguarTask,
                    pantherTask,
+                   tigerTask,
                    beastTask1,
                    beastTask2,
-##                    cyclopsTask,
                    ]
     
     # Finalization.  This is for things that must wait until all the
@@ -115,9 +121,10 @@ def usage():
     print "   skipdocs     Don't rebuild the docs"
     print "   skipwin      Don't do the remote Windows build"
     print "   skiposx      Don't do the remote OSX build"
-    print "   skiplinux    Don't do the remote Linux build"
+    print "   skiplinux    Don't do the remote Linux (RPM) build"
     print "   skipclean    Don't do the cleanup step on the remote builds"
     print "   skipupload   Don't upload the builds to starship"
+    print "   ansi         Also do the ansi builds"
     print ""
     print "   nocohost     Don't start the coLinux sessions if they are"
     print "                not already online"
@@ -168,6 +175,9 @@ def main(args):
         elif flag == "skipupload":
             config.skipupload = "yes"
 
+        elif flag == "ansi":
+            config.buildansi = "yes"
+
         elif flag == "nocohost":
             config.startcohost = "no"