Commit d70c15f0 authored by Guido van Rossum's avatar Guido van Rossum

Make the TARGET version 2.2.3. (Should also update README.)

Add 2.3b1, 2.2.2 as acceptable targets.
Strip trailing '+' from version number in Python.
parent 3e1072c9
#!/bin/sh #!/bin/sh
# Zope configure script # Zope configure script
# $Id: configure,v 1.4 2003/03/22 17:02:12 chrism Exp $ # $Id: configure,v 1.5 2003/06/10 17:26:03 gvanrossum Exp $
# $Revision: 1.4 $ # $Revision: 1.5 $
##################################################################### #####################################################################
# BEGIN EDITABLE PARAMETERS # # BEGIN EDITABLE PARAMETERS #
...@@ -13,13 +13,13 @@ ZOPE_VERS=2.7 ...@@ -13,13 +13,13 @@ ZOPE_VERS=2.7
# Place the optimal target version number for Zope (as returned by sys.version) # Place the optimal target version number for Zope (as returned by sys.version)
# below # below
TARGET="2.2.2" TARGET="2.2.3"
# Order a list of "acceptable" python version numbers (as returned by # Order a list of "acceptable" python version numbers (as returned by
# sys.version) below in "best" to "worst" order. Up to six # sys.version) below in "best" to "worst" order. Up to six
# acceptable python versions are allowed. Do not include the target # acceptable python versions are allowed. Do not include the target
# version number in this list. # version number in this list.
ACCEPTABLE="2.3 2.3a1 2.3a0" ACCEPTABLE="2.3 1.2b1 2.3a1 2.3a0 2.2.2"
# provide the executable names for all the acceptable versions # provide the executable names for all the acceptable versions
# (and the target version) below # (and the target version) below
...@@ -67,7 +67,9 @@ get_python() { ...@@ -67,7 +67,9 @@ get_python() {
for EXECUTABLE in $EXENAMES; do for EXECUTABLE in $EXENAMES; do
FULL="$DIR/$EXECUTABLE" FULL="$DIR/$EXECUTABLE"
if [ -x "$FULL" ]; then if [ -x "$FULL" ]; then
CMD="import string,sys;print string.split(sys.version)[0]" CMD="import string,sys;a=string.split(sys.version)[0]"
# Strip trailing + from version number
CMD="$CMD;a=(a[-1]=='+')and(a[:-1])or(a);print a"
VERSION=`$FULL -c "$CMD"` VERSION=`$FULL -c "$CMD"`
echo " Python version $VERSION found at $FULL" echo " Python version $VERSION found at $FULL"
if [ "$VERSION" = "$TARGET" ]; then if [ "$VERSION" = "$TARGET" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment