/[gentoo-x86]/eclass/python.eclass
Gentoo

Diff of /eclass/python.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.60 Revision 1.67
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.60 2009/08/05 18:31:30 arfrever Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.67 2009/08/29 02:15:24 arfrever Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# python@gentoo.org 7# python@gentoo.org
8# 8#
9# original author: Alastair Tse <liquidx@gentoo.org> 9# original author: Alastair Tse <liquidx@gentoo.org>
10# @BLURB: A Utility Eclass that should be inherited by anything that deals with Python or Python modules. 10# @BLURB: A Utility Eclass that should be inherited by anything that deals with Python or Python modules.
11# @DESCRIPTION: 11# @DESCRIPTION:
12# Some useful functions for dealing with python. 12# Some useful functions for dealing with Python.
13inherit alternatives multilib
14 13
14inherit multilib
15 15
16if [[ -n "${NEED_PYTHON}" ]] ; then 16if [[ -n "${NEED_PYTHON}" ]] ; then
17 PYTHON_ATOM=">=dev-lang/python-${NEED_PYTHON}" 17 PYTHON_ATOM=">=dev-lang/python-${NEED_PYTHON}"
18 DEPEND="${PYTHON_ATOM}" 18 DEPEND="${PYTHON_ATOM}"
19 RDEPEND="${DEPEND}" 19 RDEPEND="${DEPEND}"
20else 20else
21 PYTHON_ATOM="dev-lang/python" 21 PYTHON_ATOM="dev-lang/python"
22fi 22fi
23 23
24DEPEND="${DEPEND} >=app-shells/bash-3.2"
24if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 25if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
25 DEPEND="${DEPEND} >=app-admin/eselect-python-20090804" 26 DEPEND="${DEPEND} >=app-admin/eselect-python-20090804"
26fi 27fi
27 28
28__python_eclass_test() { 29__python_eclass_test() {
110 111
111# @FUNCTION: validate_PYTHON_ABIS 112# @FUNCTION: validate_PYTHON_ABIS
112# @DESCRIPTION: 113# @DESCRIPTION:
113# Make sure PYTHON_ABIS variable has valid value. 114# Make sure PYTHON_ABIS variable has valid value.
114validate_PYTHON_ABIS() { 115validate_PYTHON_ABIS() {
116 # Ensure that some functions cannot be accidentally successfully used in EAPI <= 2 without setting SUPPORT_PYTHON_ABIS variable.
117 if has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
118 die "${FUNCNAME}() cannot be used in this EAPI without setting SUPPORT_PYTHON_ABIS variable"
119 fi
120
115 # Ensure that /usr/bin/python and /usr/bin/python-config are valid. 121 # Ensure that /usr/bin/python and /usr/bin/python-config are valid.
116 if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper program"* ]]; then 122 if [[ "$(readlink /usr/bin/python)" != "python-wrapper" ]]; then
117 die "/usr/bin/python isn't valid program" 123 die "'/usr/bin/python' isn't valid symlink"
118 fi 124 fi
119 if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then 125 if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then
120 die "/usr/bin/python-config isn't valid script" 126 die "'/usr/bin/python-config' isn't valid script"
121 fi 127 fi
122 128
123 # USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4. 129 # USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4.
124 if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then 130 if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then
125 local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI 131 local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI
128 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then 134 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then
129 ewarn "Ignoring unsupported Python ABI '${ABI}'" 135 ewarn "Ignoring unsupported Python ABI '${ABI}'"
130 continue 136 continue
131 fi 137 fi
132 support_ABI="1" 138 support_ABI="1"
139 if [[ -z "${IGNORE_RESTRICT_PYTHON_ABIS}" ]]; then
133 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do 140 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
134 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${ABI}', '${restricted_ABI}'))"; then 141 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${ABI}', '${restricted_ABI}'))"; then
135 support_ABI="0" 142 support_ABI="0"
136 break 143 break
137 fi 144 fi
138 done 145 done
146 fi
139 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}" 147 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}"
140 done 148 done
141 export PYTHON_ABIS="${supported_PYTHON_ABIS# }" 149 export PYTHON_ABIS="${supported_PYTHON_ABIS# }"
142 fi 150 fi
143 151
144 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then 152 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
145 python_version 153 python_version
146 export PYTHON_ABIS="${PYVER}" 154 export PYTHON_ABIS="${PYVER}"
147 fi 155 fi
156
157 # Ensure that EPYTHON variable is respected.
158 local PYTHON_ABI
159 for PYTHON_ABI in ${PYTHON_ABIS}; do
160 if [[ "$(EPYTHON="$(PYTHON)" python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" != "${PYTHON_ABI}" ]]; then
161 die "'python' doesn't respect EPYTHON variable"
162 fi
163 done
148} 164}
149 165
150# @FUNCTION: python_copy_sources 166# @FUNCTION: python_copy_sources
151# @USAGE: [directory] 167# @USAGE: [directory]
152# @DESCRIPTION: 168# @DESCRIPTION:
176# @DESCRIPTION: 192# @DESCRIPTION:
177# Create build directory symlink. 193# Create build directory symlink.
178python_set_build_dir_symlink() { 194python_set_build_dir_symlink() {
179 local dir="$1" 195 local dir="$1"
180 196
181 [[ -z "${PYTHON_ABIS}" ]] && die "PYTHON_ABIS variable not set" 197 [[ -z "${PYTHON_ABI}" ]] && die "PYTHON_ABI variable not set"
182 [[ -z "${dir}" ]] && dir="build" 198 [[ -z "${dir}" ]] && dir="build"
183 199
184 # Don't delete preexistent directories. 200 # Don't delete preexistent directories.
185 rm -f "${dir}" || die "Deletion of '${dir}' failed" 201 rm -f "${dir}" || die "Deletion of '${dir}' failed"
186 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed" 202 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed"
215 ;; 231 ;;
216 -s|--separate-build-dirs) 232 -s|--separate-build-dirs)
217 separate_build_dirs="1" 233 separate_build_dirs="1"
218 ;; 234 ;;
219 -*) 235 -*)
220 die "${FUNCNAME}(): Unrecognized option $1" 236 die "${FUNCNAME}(): Unrecognized option '$1'"
221 ;; 237 ;;
222 *) 238 *)
223 break 239 break
224 ;; 240 ;;
225 esac 241 esac
230 if [[ "$#" -eq "0" ]]; then 246 if [[ "$#" -eq "0" ]]; then
231 die "${FUNCNAME}(): Missing function name" 247 die "${FUNCNAME}(): Missing function name"
232 fi 248 fi
233 function="$1" 249 function="$1"
234 shift 250 shift
251
252 if [[ -z "$(type -t "${function}")" ]]; then
253 die "${FUNCNAME}(): '${function}' function isn't defined"
254 fi
235 else 255 else
236 if [[ "$#" -ne "0" ]]; then 256 if [[ "$#" -ne "0" ]]; then
237 die "${FUNCNAME}(): --default-function option and function name cannot be specified simultaneously" 257 die "${FUNCNAME}(): '--default-function' option and function name cannot be specified simultaneously"
238 fi 258 fi
239 if has "${EAPI:-0}" 0 1; then 259 if has "${EAPI:-0}" 0 1; then
240 die "${FUNCNAME}(): --default-function option cannot be used in this EAPI" 260 die "${FUNCNAME}(): '--default-function' option cannot be used in this EAPI"
241 fi 261 fi
242 262
243 if [[ "${EBUILD_PHASE}" == "configure" ]]; then 263 if [[ "${EBUILD_PHASE}" == "configure" ]]; then
264 if has "${EAPI}" 2; then
244 python_default_function() { 265 python_default_function() {
245 econf 266 econf
246 } 267 }
268 else
269 python_default_function() {
270 nonfatal econf
271 }
272 fi
247 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then 273 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then
248 python_default_function() { 274 python_default_function() {
249 emake 275 emake
250 } 276 }
251 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 277 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
301 else 327 else
302 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..." 328 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..."
303 fi 329 fi
304 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}" 330 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}"
305 fi 331 fi
332
306 if [[ "${separate_build_dirs}" == "1" ]]; then 333 if [[ "${separate_build_dirs}" == "1" ]]; then
307 export BUILDDIR="${S}-${PYTHON_ABI}" 334 export BUILDDIR="${S}-${PYTHON_ABI}"
308 pushd "${BUILDDIR}" > /dev/null || die "pushd failed" 335 pushd "${BUILDDIR}" > /dev/null || die "pushd failed"
309 else 336 else
310 export BUILDDIR="${S}" 337 export BUILDDIR="${S}"
311 fi 338 fi
339
340 if ! has "${EAPI}" 0 1 2 && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
341 EPYTHON="$(PYTHON)" nonfatal "${function}" "$@"
342 else
312 if ! EPYTHON="$(PYTHON)" "${function}" "$@"; then 343 EPYTHON="$(PYTHON)" "${function}" "$@"
344 fi
345
346 if [[ "$?" != "0" ]]; then
313 if [[ -n "${failure_message_template}" ]]; then 347 if [[ -n "${failure_message_template}" ]]; then
314 failure_message="$(eval echo -n "${failure_message_template}")" 348 failure_message="$(eval echo -n "${failure_message_template}")"
315 else 349 else
316 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function" 350 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function"
317 fi 351 fi
352
318 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then 353 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
319 local ABI enabled_PYTHON_ABIS 354 local ABI enabled_PYTHON_ABIS
320 for ABI in ${PYTHON_ABIS}; do 355 for ABI in ${PYTHON_ABIS}; do
321 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}" 356 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}"
322 done 357 done
326 fi 361 fi
327 else 362 else
328 die "${failure_message}" 363 die "${failure_message}"
329 fi 364 fi
330 fi 365 fi
366
331 if [[ "${separate_build_dirs}" == "1" ]]; then 367 if [[ "${separate_build_dirs}" == "1" ]]; then
332 popd > /dev/null || die "popd failed" 368 popd > /dev/null || die "popd failed"
333 fi 369 fi
334 unset BUILDDIR 370 unset BUILDDIR
335 done 371 done
358 394
359# @FUNCTION: python_pkg_setup 395# @FUNCTION: python_pkg_setup
360# @DESCRIPTION: 396# @DESCRIPTION:
361# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags 397# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags
362# are respected. Only exported if one of those variables is set. 398# are respected. Only exported if one of those variables is set.
363if ! has ${EAPI} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then 399if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then
364 python_pkg_setup_fail() { 400 python_pkg_setup_fail() {
365 eerror "${1}" 401 eerror "${1}"
366 die "${1}" 402 die "${1}"
367 } 403 }
368 404
410 fi 446 fi
411 DEPEND="${PYTHON_USE_WITH_ATOM}" 447 DEPEND="${PYTHON_USE_WITH_ATOM}"
412 RDEPEND="${PYTHON_USE_WITH_ATOM}" 448 RDEPEND="${PYTHON_USE_WITH_ATOM}"
413fi 449fi
414 450
451# @ECLASS-VARIABLE: PYTHON_DEFINE_DEFAULT_FUNCTIONS
452# @DESCRIPTION:
453# Set this to define default functions for the following ebuild phases:
454# src_prepare, src_configure, src_compile, src_test, src_install.
455if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_DEFINE_DEFAULT_FUNCTIONS}" ]]; then
456 python_src_prepare() {
457 python_copy_sources
458 }
459
460 for python_default_function in src_configure src_compile src_test src_install; do
461 eval "python_${python_default_function}() { python_execute_function -d -s; }"
462 done
463 unset python_default_function
464
465 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
466fi
467
415# @FUNCTION: python_disable_pyc 468# @FUNCTION: python_disable_pyc
416# @DESCRIPTION: 469# @DESCRIPTION:
417# Tells python not to automatically recompile modules to .pyc/.pyo 470# Tell Python not to automatically recompile modules to .pyc/.pyo
418# even if the timestamps/version stamps don't match. This is done 471# even if the timestamps/version stamps don't match. This is done
419# to protect sandbox. 472# to protect sandbox.
420#
421# note: supported by >=dev-lang/python-2.2.3-r3 only.
422#
423python_disable_pyc() { 473python_disable_pyc() {
424 export PYTHONDONTWRITEBYTECODE=1 # For 2.6 and above 474 export PYTHONDONTWRITEBYTECODE="1"
425 export PYTHON_DONTCOMPILE=1 # For 2.5 and below
426} 475}
427 476
428# @FUNCTION: python_enable_pyc 477# @FUNCTION: python_enable_pyc
429# @DESCRIPTION: 478# @DESCRIPTION:
430# Tells python to automatically recompile modules to .pyc/.pyo if the 479# Tell Python to automatically recompile modules to .pyc/.pyo if the
431# timestamps/version stamps change 480# timestamps/version stamps have changed.
432python_enable_pyc() { 481python_enable_pyc() {
433 unset PYTHONDONTWRITEBYTECODE 482 unset PYTHONDONTWRITEBYTECODE
434 unset PYTHON_DONTCOMPILE
435} 483}
436 484
437python_disable_pyc 485python_disable_pyc
438 486
439# @FUNCTION: python_need_rebuild 487# @FUNCTION: python_need_rebuild
471# @FUNCTION: python_get_sitedir 519# @FUNCTION: python_get_sitedir
472# @DESCRIPTION: 520# @DESCRIPTION:
473# Run without arguments, returns the Python site-packages directory. 521# Run without arguments, returns the Python site-packages directory.
474python_get_sitedir() { 522python_get_sitedir() {
475 echo "$(python_get_libdir)/site-packages" 523 echo "$(python_get_libdir)/site-packages"
476}
477
478# @FUNCTION: python_makesym
479# @DESCRIPTION:
480# Run without arguments, it will create the /usr/bin/python symlinks
481# to the latest installed version
482python_makesym() {
483 alternatives_auto_makesym "/usr/bin/python" "python[0-9].[0-9]"
484 alternatives_auto_makesym "/usr/bin/python2" "python2.[0-9]"
485} 524}
486 525
487# @FUNCTION: python_tkinter_exists 526# @FUNCTION: python_tkinter_exists
488# @DESCRIPTION: 527# @DESCRIPTION:
489# Run without arguments, checks if python was compiled with Tkinter 528# Run without arguments, checks if python was compiled with Tkinter
550 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}") 589 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}")
551 done 590 done
552 591
553 if ((${#myfiles[@]})); then 592 if ((${#myfiles[@]})); then
554 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 593 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}"
555 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 594 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" &> /dev/null
556 else 595 else
557 ewarn "No files to compile!" 596 ewarn "No files to compile!"
558 fi 597 fi
559} 598}
560 599
608 else 647 else
609 ewarn "'${root}/$1' doesn't exist!" 648 ewarn "'${root}/$1' doesn't exist!"
610 fi 649 fi
611 else 650 else
612 for PYTHON_ABI in ${PYTHON_ABIS}; do 651 for PYTHON_ABI in ${PYTHON_ABIS}; do
613 if [[ -d "${root}/$(python_get_sitedir)/$1" ]]; then 652 if [[ -d "${root}$(python_get_sitedir)/$1" ]]; then
614 site_packages_dirs+=("$1") 653 site_packages_dirs+=("$1")
615 break 654 break
616 elif [[ -f "${root}/$(python_get_sitedir)/$1" ]]; then 655 elif [[ -f "${root}$(python_get_sitedir)/$1" ]]; then
617 site_packages_files+=("$1") 656 site_packages_files+=("$1")
618 break 657 break
619 elif [[ -e "${root}/$(python_get_sitedir)/$1" ]]; then 658 elif [[ -e "${root}$(python_get_sitedir)/$1" ]]; then
620 ewarn "'$1' is not a file or a directory!" 659 ewarn "'$1' is not a file or a directory!"
621 else 660 else
622 ewarn "'$1' doesn't exist!" 661 ewarn "'$1' doesn't exist!"
623 fi 662 fi
624 done 663 done
635 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then 674 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then
636 return_code="0" 675 return_code="0"
637 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}" 676 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}"
638 if ((${#site_packages_dirs[@]})); then 677 if ((${#site_packages_dirs[@]})); then
639 for dir in "${site_packages_dirs[@]}"; do 678 for dir in "${site_packages_dirs[@]}"; do
640 site_packages_absolute_dirs+=("${root}/$(python_get_sitedir)/${dir}") 679 site_packages_absolute_dirs+=("${root}$(python_get_sitedir)/${dir}")
641 done 680 done
642 "$(PYTHON)" "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 681 "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1"
643 "$(PYTHON)" -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 682 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" &> /dev/null || return_code="1"
644 fi 683 fi
645 if ((${#site_packages_files[@]})); then 684 if ((${#site_packages_files[@]})); then
646 for file in "${site_packages_files[@]}"; do 685 for file in "${site_packages_files[@]}"; do
647 site_packages_absolute_files+=("${root}/$(python_get_sitedir)/${file}") 686 site_packages_absolute_files+=("${root}$(python_get_sitedir)/${file}")
648 done 687 done
649 "$(PYTHON)" "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 688 "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1"
650 "$(PYTHON)" -O "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 689 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" &> /dev/null || return_code="1"
651 fi 690 fi
652 eend "${return_code}" 691 eend "${return_code}"
653 fi 692 fi
654 unset site_packages_absolute_dirs site_packages_absolute_files 693 unset site_packages_absolute_dirs site_packages_absolute_files
655 done 694 done
659 698
660 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 699 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
661 return_code="0" 700 return_code="0"
662 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..." 701 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..."
663 if ((${#other_dirs[@]})); then 702 if ((${#other_dirs[@]})); then
664 python${PYVER} "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 703 python${PYVER} "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1"
665 python${PYVER} -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 704 python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
666 fi 705 fi
667 if ((${#other_files[@]})); then 706 if ((${#other_files[@]})); then
668 python${PYVER} "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 707 python${PYVER} "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1"
669 python${PYVER} -O "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 708 python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1"
670 fi 709 fi
671 eend "${return_code}" 710 eend "${return_code}"
672 fi 711 fi
673 else 712 else
674 local myroot mydirs=() myfiles=() myopts=() 713 local myroot mydirs=() myfiles=() myopts=() return_code="0"
675 714
676 # strip trailing slash 715 # strip trailing slash
677 myroot="${ROOT%/}" 716 myroot="${ROOT%/}"
678 717
679 # respect ROOT and options passed to compileall.py 718 # respect ROOT and options passed to compileall.py
717 756
718 ebegin "Byte compiling python modules for python-${PYVER} .." 757 ebegin "Byte compiling python modules for python-${PYVER} .."
719 if ((${#mydirs[@]})); then 758 if ((${#mydirs[@]})); then
720 python${PYVER} \ 759 python${PYVER} \
721 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 760 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
722 "${myopts[@]}" "${mydirs[@]}" 761 "${myopts[@]}" "${mydirs[@]}" || return_code="1"
723 python${PYVER} -O \ 762 python${PYVER} -O \
724 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 763 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
725 "${myopts[@]}" "${mydirs[@]}" 764 "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code="1"
726 fi 765 fi
727 766
728 if ((${#myfiles[@]})); then 767 if ((${#myfiles[@]})); then
729 python_mod_compile "${myfiles[@]}" 768 python_mod_compile "${myfiles[@]}"
730 fi 769 fi
731 770
732 eend $? 771 eend "${return_code}"
733 fi 772 fi
734} 773}
735 774
736# @FUNCTION: python_mod_cleanup 775# @FUNCTION: python_mod_cleanup
737# @USAGE: [directory] 776# @USAGE: [directory]
760 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories" 799 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories"
761 elif [[ "$1" =~ ^/ ]]; then 800 elif [[ "$1" =~ ^/ ]]; then
762 SEARCH_PATH+=("${root}/${1#/}") 801 SEARCH_PATH+=("${root}/${1#/}")
763 else 802 else
764 for PYTHON_ABI in ${PYTHON_ABIS}; do 803 for PYTHON_ABI in ${PYTHON_ABIS}; do
765 SEARCH_PATH+=("${root}/$(python_get_sitedir)/$1") 804 SEARCH_PATH+=("${root}$(python_get_sitedir)/$1")
766 done 805 done
767 fi 806 fi
768 shift 807 shift
769 done 808 done
770 else 809 else
774 else 813 else
775 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages) 814 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages)
776 fi 815 fi
777 816
778 for path in "${SEARCH_PATH[@]}"; do 817 for path in "${SEARCH_PATH[@]}"; do
818 [[ ! -d "${path}" ]] && continue
779 einfo "Cleaning orphaned Python bytecode from ${path} .." 819 einfo "Cleaning orphaned Python bytecode from ${path} .."
780 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do 820 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do
781 src_py="${REPLY%[co]}" 821 src_py="${REPLY%[co]}"
782 [[ -f "${src_py}" ]] && continue 822 [[ -f "${src_py}" || (! -f "${src_py}c" && ! -f "${src_py}o") ]] && continue
783 einfo "Purging ${src_py}[co]" 823 einfo "Purging ${src_py}[co]"
784 rm -f "${src_py}"[co] 824 rm -f "${src_py}"[co]
785 done 825 done
786 826
787 # Attempt to remove directories that may be empty. 827 # Attempt to remove directories that may be empty.
788 find "${path}" -type d | sort -r | while read -r dir; do 828 find "${path}" -type d | sort -r | while read -r dir; do
789 rmdir "${dir}" 2>/dev/null 829 rmdir "${dir}" 2>/dev/null && einfo "Removing empty directory ${dir}"
790 done 830 done
791 done 831 done
792} 832}

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.67

  ViewVC Help
Powered by ViewVC 1.1.20