From dc5bee0a1522852cdbe3c87a7f8cbfd43cbb4e58 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 9 Nov 2004 03:40:11 +0000 Subject: [PATCH] Can't use the config.PYVER value if it hasn't been set yet... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/distrib/all/build-all | 4 ++-- wxPython/distrib/all/build-rpm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all index e60a899127..24f66ead48 100755 --- a/wxPython/distrib/all/build-all +++ b/wxPython/distrib/all/build-all @@ -102,7 +102,7 @@ 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.PYVER]), +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"]), @@ -115,7 +115,7 @@ buildTasks = [ windowsTask, ] # Finalization. This is for things that must wait until all the -# builds are done, such as copying the isntallers someplace, sending +# builds are done, such as copying the installers someplace, sending # emails, etc. finalizationTask = Task( Job("", ["distrib/all/build-finalize", CFGFILE]) ) diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm index 89b13e1e87..f53be94cdc 100755 --- a/wxPython/distrib/all/build-rpm +++ b/wxPython/distrib/all/build-rpm @@ -12,6 +12,10 @@ reltag=$4 shift;shift;shift;shift pyver=$@ +if [ $pyver = config ]; then + pyver=$PYVER +fi + function TestOnline { local host=$1 -- 2.45.2