No animate contrib anymore

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

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index 2d005d13740514f03367b16d00f4980d8c29ca89..aca8fbba8a290f0ba4cb3e9666c359e73f6181f3 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.
     
-    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",
@@ -73,25 +73,31 @@ def getTasks(config_env):
 
     
     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("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("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", ["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-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,
+    xavierTask = Task([
+        Job("xavier", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
+        ])
+
+    buildTasks = [ #jaguarTask,
                    pantherTask,
                    tigerTask,
                    beastTask1,
                    beastTask2,
+                   xavierTask,
                    ]
     
     # Finalization.  This is for things that must wait until all the
@@ -120,7 +126,8 @@ 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 (RPM) build"
+    print "   skiprpm      Don't do the remote Linux (RPM) build"
+    print "   skipdeb      Don't do the remote Linux (DEB) 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"
@@ -165,8 +172,11 @@ def main(args):
         elif flag == "skiposx":
             config.skiposx = "yes"
             
-        elif flag == "skiplinux":
-            config.skiplinux = "yes"
+        elif flag == "skipdeb":
+            config.skipdeb = "yes"
+            
+        elif flag == "skiprpm":
+            config.skiprpm = "yes"
             
         elif flag == "skipclean":
             config.skipclean = "yes"
@@ -197,7 +207,8 @@ def main(args):
         file("DAILY_BUILD", "w").write(config.DAILY)
     sys.path.append('.')
     import setup
-    config.VERSION = setup.VERSION
+    v = config.VERSION = setup.VERSION
+    config.VER2 = '.'.join(v.split('.')[:2])
 
     config_env = config.asDict()
     config_env.update(os.environ)