Print this page
Infrastructure for python version agility
Reviewed by: Dale Ghent <daleg@omniti.com>
Reviewed by: Eric Sproul <eric.sproul@circonus.com>

Split Close
Expand all
Collapse all
          --- old/lib/functions.sh
          +++ new/lib/functions.sh
↓ open down ↓ 677 lines elided ↑ open up ↑
 678  678          logmsg "------ Setting human-readable version"
 679  679          echo "set name=pkg.human-version value=\"$VERHUMAN\"" >> $MY_MOG_FILE
 680  680      fi
 681  681      echo "set name=pkg.summary value=\"$SUMMARY\"" >> $MY_MOG_FILE
 682  682      echo "set name=pkg.descr value=\"$DESCSTR\"" >> $MY_MOG_FILE
 683  683      echo "set name=publisher value=\"sa@omniti.com\"" >> $MY_MOG_FILE
 684  684      if [[ -f $SRCDIR/local.mog ]]; then
 685  685          LOCAL_MOG_FILE=$SRCDIR/local.mog
 686  686      fi
 687  687      logmsg "--- Applying transforms"
 688      -    $PKGMOGRIFY $P5M_INT $MY_MOG_FILE $GLOBAL_MOG_FILE $LOCAL_MOG_FILE $* | $PKGFMT -u > $P5M_INT2
      688 +    $PKGMOGRIFY $XFORM_ARGS $P5M_INT $MY_MOG_FILE $GLOBAL_MOG_FILE $LOCAL_MOG_FILE $* | $PKGFMT -u > $P5M_INT2
 689  689      logmsg "--- Resolving dependencies"
 690  690      (
 691  691          set -e
 692  692          $PKGDEPEND generate -md $DESTDIR $P5M_INT2 > $P5M_INT3
 693  693          $PKGDEPEND resolve -m $P5M_INT3
 694  694      ) || logerr "--- Dependency resolution failed"
 695  695      echo > "$MANUAL_DEPS"
 696  696      if [[ -n "$RUN_DEPENDS_IPS" ]]; then
 697  697          logmsg "------ Adding manual dependencies"
 698  698          for i in $RUN_DEPENDS_IPS; do
↓ open down ↓ 550 lines elided ↑ open up ↑
1249 1249      if [ -h $PREBUILT_ILLUMOS/log/nightly.lock ]; then
1250 1250          logmsg "Nightly lock present, but build not running.  Bailing."
1251 1251          if [[ -z $BATCH ]]; then
1252 1252              ask_to_continue
1253 1253          fi
1254 1254          clean_up
1255 1255          exit 1
1256 1256      fi
1257 1257  }
1258 1258  
     1259 +# Change the PYTHON version so we can perform version-agile Python tricks.
     1260 +set_python_version() {
     1261 +    PYTHONVER=$1
     1262 +    PYTHONPKGVER=`echo $PYTHONVER | sed 's/\.//g'`
     1263 +    # Assume PYTHONPATH from config.sh is a constant.
     1264 +    PYTHON=$PYTHONPATH/bin/python$PYTHONVER
     1265 +    PYTHONLIB=$PYTHONPATH/lib
     1266 +}
     1267 +
1259 1268  # Vim hints
1260 1269  # vim:ts=4:sw=4:et:
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX