From: Robin Dunn Date: Fri, 10 Mar 2006 00:31:25 +0000 (+0000) Subject: slight refactor X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/46910b0611d8d60b58f622242350b2212e05dddf?ds=inline slight refactor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all index ad6939b232..f6044e07ab 100755 --- a/wxPython/distrib/all/build-all +++ b/wxPython/distrib/all/build-all @@ -37,6 +37,66 @@ 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), + ]) + + # 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) ) + + 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) + ]) + + beastTask1 = Task( + [ Job("beast.23", "distrib/all/build-windows", ["2.3"], env=config_env), + Job("beast.24", "distrib/all/build-windows", ["2.4"], env=config_env), + Job("co-mdk102.24", "distrib/all/build-rpm", ["beast", "co-mdk102","mdk102","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-mdk101.23", "distrib/all/build-rpm", ["beast", "co-mdk101","mdk101","2.3"], env=config_env), + Job("co-fc2.24", "distrib/all/build-rpm", ["beast", "co-fc2", "fc2", "2.4"], env=config_env), + #Job("co-mdk101.24", "distrib/all/build-rpm", ["beast", "co-mdk101","mdk101","2.4"], env=config), + ]) + + 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, + pantherTask, + beastTask1, + beastTask2, + cyclopsTask, + ] + + # Finalization. This is for things that must wait until all the + # builds are done, such as copying the installers someplace, sending + # emails, etc. + finalizationTask = Task( Job("", "distrib/all/build-finalize", env=config_env) ) + + return initialTask, buildTasks, finalizationTask + + +#---------------------------------------------------------------------- + def usage(): print "" print "Usage: build-all [command flags...]" @@ -131,58 +191,10 @@ def main(args): config_env = config.asDict() config_env.update(os.environ) - # 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), - ]) - - # 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) ) - - 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) - ]) - - beastTask1 = Task([ Job("beast.23", "distrib/all/build-windows", ["2.3"], env=config_env), - Job("beast.24", "distrib/all/build-windows", ["2.4"], env=config_env), - Job("co-mdk102.24", "distrib/all/build-rpm", ["beast", "co-mdk102","mdk102","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-mdk101.23", "distrib/all/build-rpm", ["beast", "co-mdk101","mdk101","2.3"], env=config_env), - Job("co-fc2.24", "distrib/all/build-rpm", ["beast", "co-fc2", "fc2", "2.4"], env=config_env), - #Job("co-mdk101.24", "distrib/all/build-rpm", ["beast", "co-mdk101","mdk101","2.4"], env=config), - ]) - - 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, - pantherTask, - beastTask1, - beastTask2, - cyclopsTask, - ] - - # Finalization. This is for things that must wait until all the - # builds are done, such as copying the installers someplace, sending - # emails, etc. - finalizationTask = Task( Job("", "distrib/all/build-finalize", env=config_env) ) - + initialTask, buildTasks, finalizationTask = getTasks(config_env) print "Build getting started at: ", time.ctime() - # Run the first task, which will create the docs and sources tarballs tr = TaskRunner(initialTask) rc = tr.run()