Print this page
Remove Python 2.6

Split Close
Expand all
Collapse all
          --- old/build/python-setuptools/build.sh
          +++ new/build/python-setuptools/build.sh
↓ open down ↓ 24 lines elided ↑ open up ↑
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  # Load support functions
  28   28  . ../../lib/functions.sh
  29   29  
  30   30  PROG=setuptools
  31   31  VER=0.6.11
  32   32  SUMMARY="setuptools - yet another python packaging requirement"
  33   33  DESC="$SUMMARY"
  34   34  
  35      -# Pardon the copy/paste, but we have to do this twice (2.6 & 2.7) for now.
  36      -# And the only way buildctl detects packages is by grepping for PKG assignment.
  37      -
  38      -OLDPV=$PYTHONVER
  39      -
  40      -set_python_version 2.6
       35 +# In the future when we upgrade python again, be sure to wrap the following
       36 +# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.
       37 +# The only way buildctl detects packages is by grepping for PKG assignment.
  41   38  XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
  42      -RUN_DEPENDS_IPS="runtime/python-26"
  43      -PKG=library/python-2/setuptools-26
  44      -init
  45      -prep_build
  46      -mkdir -p $DESTDIR/usr/lib/python2.6/vendor-packages
  47      -PYTHONPATH=$DESTDIR/usr/lib/python2.6/vendor-packages \
  48      -    python2.6 ez_setup.py --always-copy \
  49      -        --install-dir $DESTDIR/usr/lib/python2.6/vendor-packages/ \
  50      -        setuptools
  51      -make_package
  52      -clean_up
  53      -
  54      -set_python_version 2.7
  55      -XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
  56   39  RUN_DEPENDS_IPS="runtime/python-27"
  57   40  PKG=library/python-2/setuptools-27
  58   41  init
  59   42  prep_build
  60   43  mkdir -p $DESTDIR/usr/lib/python2.7/vendor-packages
  61   44  PYTHONPATH=$DESTDIR/usr/lib/python2.7/vendor-packages \
  62   45      python2.7 ez_setup.py --always-copy \
  63   46          --install-dir $DESTDIR/usr/lib/python2.7/vendor-packages/ \
  64   47          setuptools
  65   48  make_package
  66   49  clean_up
  67      -
  68      -set_python_version $OLDPV
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX