Some build tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,7 +64,6 @@ config.UPLOAD_PREVIEW_ROOT = "/home/crew/robind/public_html/wxPython/preview"
|
||||
|
||||
# defaults for build options
|
||||
config.KIND = "dryrun"
|
||||
config.PYVER = "2.3"
|
||||
config.skipsource = "no"
|
||||
config.onlysource = "no"
|
||||
config.skipdocs = "no"
|
||||
@@ -94,7 +93,9 @@ initialTask = Task([ Job("", ["distrib/all/build-setup", CFGFILE]),
|
||||
# Build tasks. Anything that can be done in parallel (depends greatly
|
||||
# on the nature of the build machine configurations...) is a separate
|
||||
# task.
|
||||
windowsTask = Task( Job("beast", ["distrib/all/build-windows", CFGFILE]) )
|
||||
windowsTask = Task( [Job("beast", ["distrib/all/build-windows", CFGFILE, "2.3"]),
|
||||
Job("beast", ["distrib/all/build-windows", CFGFILE, "2.4"])
|
||||
])
|
||||
|
||||
jaguarTask = Task( Job(config.OSX_HOST_jaguar,
|
||||
["distrib/all/build-osx", CFGFILE, config.OSX_HOST_jaguar, "jaguar"]) )
|
||||
@@ -102,16 +103,24 @@ jaguarTask = Task( Job(config.OSX_HOST_jaguar,
|
||||
pantherTask = Task( Job(config.OSX_HOST_panther,
|
||||
["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther"]) )
|
||||
|
||||
rpmTask = Task([ Job("co-rh9", ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9", "rh9", "config"]),
|
||||
Job("co-fc2", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2", "fc2", "2.3"]),
|
||||
Job("co-mdk92", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
|
||||
Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
|
||||
])
|
||||
rpmTask1 = Task([ Job("co-rh9", ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9", "rh9", "2.3"]),
|
||||
Job("co-rh9", ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9", "rh9", "2.4"]),
|
||||
Job("co-fc2", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2", "fc2", "2.3"]),
|
||||
Job("co-fc2", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2", "fc2", "2.4"]),
|
||||
])
|
||||
|
||||
rpmTask2 = Task([
|
||||
Job("co-mdk92", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
|
||||
Job("co-mdk92", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.4"]),
|
||||
Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
|
||||
Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.4"]),
|
||||
])
|
||||
|
||||
buildTasks = [ windowsTask,
|
||||
jaguarTask,
|
||||
pantherTask,
|
||||
rpmTask,
|
||||
rpmTask1,
|
||||
rpmTask2,
|
||||
]
|
||||
|
||||
# Finalization. This is for things that must wait until all the
|
||||
@@ -132,10 +141,6 @@ def usage():
|
||||
print " release Do a normal release (cantidate) build, copy to starship"
|
||||
print ""
|
||||
print "optional command flags:"
|
||||
print " 2.2 Build for Python 2.2 (default=off)"
|
||||
print " 2.3 Build for Python 2.3 (default=on)"
|
||||
print " all Build for all supported Python versions"
|
||||
print ""
|
||||
print " skipsource Don't build the source archives, use the ones"
|
||||
print " already in the staging dir."
|
||||
print " onlysource Exit after building the source and docs archives"
|
||||
@@ -163,11 +168,6 @@ def main(args):
|
||||
if flag in ["dryrun", "daily", "release"]:
|
||||
config.KIND = flag
|
||||
|
||||
elif flag in ["2.2", "2.3"]:
|
||||
config.PYVER = flag
|
||||
elif flag == "all":
|
||||
config.PYVER = "2.2 2.3"
|
||||
|
||||
elif flag == "skipsource":
|
||||
config.skipsource = "yes"
|
||||
|
||||
|
Reference in New Issue
Block a user