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

Diff of /eclass/python.eclass

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

Revision 1.58 Revision 1.66
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.58 2009/08/03 22:28:01 arfrever Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.66 2009/08/28 16:08:51 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-20090801" 26 DEPEND="${DEPEND} >=app-admin/eselect-python-20090804"
26fi 27fi
27 28
28__python_eclass_test() { 29__python_eclass_test() {
29 __python_version_extract 2.3 30 __python_version_extract 2.3
30 echo -n "2.3 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR" 31 echo -n "2.3 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
64 tmpstr="$(${python} -V 2>&1 )" 65 tmpstr="$(${python} -V 2>&1 )"
65 export PYVER_ALL="${tmpstr#Python }" 66 export PYVER_ALL="${tmpstr#Python }"
66 __python_version_extract $PYVER_ALL 67 __python_version_extract $PYVER_ALL
67} 68}
68 69
69# @FUNCTION: get_python 70# @FUNCTION: PYTHON
70# @USAGE: [-a|--absolute-path] <Python_ABI="${PYTHON_ABI}"> 71# @USAGE: [-a|--absolute-path] <Python_ABI="${PYTHON_ABI}">
71# @DESCRIPTION: 72# @DESCRIPTION:
72# Get Python interpreter filename for specified Python ABI. If Python_ABI argument 73# Get Python interpreter filename for specified Python ABI. If Python_ABI argument
73# is ommitted, then PYTHON_ABI environment variable must be set and is used. 74# is ommitted, then PYTHON_ABI environment variable must be set and is used.
74get_python() { 75PYTHON() {
75 local absolute_path="0" slot= 76 local absolute_path="0" slot=
76 77
77 while (($#)); do 78 while (($#)); do
78 case "$1" in 79 case "$1" in
79 -a|--absolute-path) 80 -a|--absolute-path)
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 scripts. 121 # Ensure that /usr/bin/python and /usr/bin/python-config are valid.
116 if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper script"* ]]; then 122 if [[ "$(readlink /usr/bin/python)" != "python-wrapper" ]]; then
117 die "/usr/bin/python isn't valid script" 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"
187} 203}
188 204
189# @FUNCTION: python_execute_function 205# @FUNCTION: python_execute_function
190# @USAGE: [--action-message message] [-d|--default-function] [--failure-message message] [--nonfatal] [-q|--quiet] [-s|--separate-build-dirs] <function> [arguments] 206# @USAGE: [--action-message message] [-d|--default-function] [--failure-message message] [--nonfatal] [-q|--quiet] [-s|--separate-build-dirs] <function> [arguments]
191# @DESCRIPTION: 207# @DESCRIPTION:
192# Execute specified function for each value of PYTHON_ABIS, optionally passing 208# Execute specified function for each value of PYTHON_ABIS, optionally passing additional
193# additional arguments. The specified function can use PYTHON_ABI variable. 209# arguments. The specified function can use PYTHON_ABI and BUILDDIR variables.
194python_execute_function() { 210python_execute_function() {
195 local action action_message action_message_template= default_function="0" failure_message failure_message_template= function nonfatal="0" PYTHON_ABI quiet="0" separate_build_dirs="0" 211 local action action_message action_message_template= default_function="0" failure_message failure_message_template= function nonfatal="0" PYTHON_ABI quiet="0" separate_build_dirs="0"
196 212
197 while (($#)); do 213 while (($#)); do
198 case "$1" in 214 case "$1" in
239 if has "${EAPI:-0}" 0 1; then 255 if has "${EAPI:-0}" 0 1; then
240 die "${FUNCNAME}(): --default-function option cannot be used in this EAPI" 256 die "${FUNCNAME}(): --default-function option cannot be used in this EAPI"
241 fi 257 fi
242 258
243 if [[ "${EBUILD_PHASE}" == "configure" ]]; then 259 if [[ "${EBUILD_PHASE}" == "configure" ]]; then
260 if has "${EAPI}" 2; then
244 python_default_function() { 261 python_default_function() {
245 econf 262 econf
246 } 263 }
264 else
265 python_default_function() {
266 nonfatal econf
267 }
268 fi
247 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then 269 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then
248 python_default_function() { 270 python_default_function() {
249 emake 271 emake
250 } 272 }
251 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 273 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
301 else 323 else
302 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..." 324 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..."
303 fi 325 fi
304 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}" 326 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}"
305 fi 327 fi
328
306 if [[ "${separate_build_dirs}" == "1" ]]; then 329 if [[ "${separate_build_dirs}" == "1" ]]; then
330 export BUILDDIR="${S}-${PYTHON_ABI}"
307 pushd "${S}-${PYTHON_ABI}" > /dev/null || die "pushd failed" 331 pushd "${BUILDDIR}" > /dev/null || die "pushd failed"
332 else
333 export BUILDDIR="${S}"
308 fi 334 fi
309 if ! EPYTHON="$(get_python)" "${function}" "$@"; then 335
336 if ! has "${EAPI}" 0 1 2 && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
337 EPYTHON="$(PYTHON)" nonfatal "${function}" "$@"
338 else
339 EPYTHON="$(PYTHON)" "${function}" "$@"
340 fi
341
342 if [[ "$?" != "0" ]]; then
310 if [[ -n "${failure_message_template}" ]]; then 343 if [[ -n "${failure_message_template}" ]]; then
311 failure_message="$(eval echo -n "${failure_message_template}")" 344 failure_message="$(eval echo -n "${failure_message_template}")"
312 else 345 else
313 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function" 346 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function"
314 fi 347 fi
348
315 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then 349 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
316 local ABI enabled_PYTHON_ABIS 350 local ABI enabled_PYTHON_ABIS
317 for ABI in ${PYTHON_ABIS}; do 351 for ABI in ${PYTHON_ABIS}; do
318 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}" 352 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}"
319 done 353 done
323 fi 357 fi
324 else 358 else
325 die "${failure_message}" 359 die "${failure_message}"
326 fi 360 fi
327 fi 361 fi
362
328 if [[ "${separate_build_dirs}" == "1" ]]; then 363 if [[ "${separate_build_dirs}" == "1" ]]; then
329 popd > /dev/null || die "popd failed" 364 popd > /dev/null || die "popd failed"
330 fi 365 fi
366 unset BUILDDIR
331 done 367 done
332 368
333 if [[ "${default_function}" == "1" ]]; then 369 if [[ "${default_function}" == "1" ]]; then
334 unset -f python_default_function 370 unset -f python_default_function
335 fi 371 fi
354 390
355# @FUNCTION: python_pkg_setup 391# @FUNCTION: python_pkg_setup
356# @DESCRIPTION: 392# @DESCRIPTION:
357# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags 393# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags
358# are respected. Only exported if one of those variables is set. 394# are respected. Only exported if one of those variables is set.
359if ! has ${EAPI} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then 395if ! has ${EAPI:-0} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then
360 python_pkg_setup_fail() { 396 python_pkg_setup_fail() {
361 eerror "${1}" 397 eerror "${1}"
362 die "${1}" 398 die "${1}"
363 } 399 }
364 400
408 RDEPEND="${PYTHON_USE_WITH_ATOM}" 444 RDEPEND="${PYTHON_USE_WITH_ATOM}"
409fi 445fi
410 446
411# @FUNCTION: python_disable_pyc 447# @FUNCTION: python_disable_pyc
412# @DESCRIPTION: 448# @DESCRIPTION:
413# Tells python not to automatically recompile modules to .pyc/.pyo 449# Tell Python not to automatically recompile modules to .pyc/.pyo
414# even if the timestamps/version stamps don't match. This is done 450# even if the timestamps/version stamps don't match. This is done
415# to protect sandbox. 451# to protect sandbox.
416#
417# note: supported by >=dev-lang/python-2.2.3-r3 only.
418#
419python_disable_pyc() { 452python_disable_pyc() {
420 export PYTHONDONTWRITEBYTECODE=1 # For 2.6 and above 453 export PYTHONDONTWRITEBYTECODE="1"
421 export PYTHON_DONTCOMPILE=1 # For 2.5 and below
422} 454}
423 455
424# @FUNCTION: python_enable_pyc 456# @FUNCTION: python_enable_pyc
425# @DESCRIPTION: 457# @DESCRIPTION:
426# Tells python to automatically recompile modules to .pyc/.pyo if the 458# Tell Python to automatically recompile modules to .pyc/.pyo if the
427# timestamps/version stamps change 459# timestamps/version stamps have changed.
428python_enable_pyc() { 460python_enable_pyc() {
429 unset PYTHONDONTWRITEBYTECODE 461 unset PYTHONDONTWRITEBYTECODE
430 unset PYTHON_DONTCOMPILE
431} 462}
432 463
433python_disable_pyc 464python_disable_pyc
434 465
435# @FUNCTION: python_need_rebuild 466# @FUNCTION: python_need_rebuild
467# @FUNCTION: python_get_sitedir 498# @FUNCTION: python_get_sitedir
468# @DESCRIPTION: 499# @DESCRIPTION:
469# Run without arguments, returns the Python site-packages directory. 500# Run without arguments, returns the Python site-packages directory.
470python_get_sitedir() { 501python_get_sitedir() {
471 echo "$(python_get_libdir)/site-packages" 502 echo "$(python_get_libdir)/site-packages"
472}
473
474# @FUNCTION: python_makesym
475# @DESCRIPTION:
476# Run without arguments, it will create the /usr/bin/python symlinks
477# to the latest installed version
478python_makesym() {
479 alternatives_auto_makesym "/usr/bin/python" "python[0-9].[0-9]"
480 alternatives_auto_makesym "/usr/bin/python2" "python2.[0-9]"
481} 503}
482 504
483# @FUNCTION: python_tkinter_exists 505# @FUNCTION: python_tkinter_exists
484# @DESCRIPTION: 506# @DESCRIPTION:
485# Run without arguments, checks if python was compiled with Tkinter 507# Run without arguments, checks if python was compiled with Tkinter
546 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}") 568 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}")
547 done 569 done
548 570
549 if ((${#myfiles[@]})); then 571 if ((${#myfiles[@]})); then
550 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 572 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}"
551 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 573 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" &> /dev/null
552 else 574 else
553 ewarn "No files to compile!" 575 ewarn "No files to compile!"
554 fi 576 fi
555} 577}
556 578
604 else 626 else
605 ewarn "'${root}/$1' doesn't exist!" 627 ewarn "'${root}/$1' doesn't exist!"
606 fi 628 fi
607 else 629 else
608 for PYTHON_ABI in ${PYTHON_ABIS}; do 630 for PYTHON_ABI in ${PYTHON_ABIS}; do
609 if [[ -d "${root}/$(python_get_sitedir)/$1" ]]; then 631 if [[ -d "${root}$(python_get_sitedir)/$1" ]]; then
610 site_packages_dirs+=("$1") 632 site_packages_dirs+=("$1")
611 break 633 break
612 elif [[ -f "${root}/$(python_get_sitedir)/$1" ]]; then 634 elif [[ -f "${root}$(python_get_sitedir)/$1" ]]; then
613 site_packages_files+=("$1") 635 site_packages_files+=("$1")
614 break 636 break
615 elif [[ -e "${root}/$(python_get_sitedir)/$1" ]]; then 637 elif [[ -e "${root}$(python_get_sitedir)/$1" ]]; then
616 ewarn "'$1' is not a file or a directory!" 638 ewarn "'$1' is not a file or a directory!"
617 else 639 else
618 ewarn "'$1' doesn't exist!" 640 ewarn "'$1' doesn't exist!"
619 fi 641 fi
620 done 642 done
631 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then 653 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then
632 return_code="0" 654 return_code="0"
633 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}" 655 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}"
634 if ((${#site_packages_dirs[@]})); then 656 if ((${#site_packages_dirs[@]})); then
635 for dir in "${site_packages_dirs[@]}"; do 657 for dir in "${site_packages_dirs[@]}"; do
636 site_packages_absolute_dirs+=("${root}/$(python_get_sitedir)/${dir}") 658 site_packages_absolute_dirs+=("${root}$(python_get_sitedir)/${dir}")
637 done 659 done
638 "$(get_python)" "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 660 "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1"
639 "$(get_python)" -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 661 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" &> /dev/null || return_code="1"
640 fi 662 fi
641 if ((${#site_packages_files[@]})); then 663 if ((${#site_packages_files[@]})); then
642 for file in "${site_packages_files[@]}"; do 664 for file in "${site_packages_files[@]}"; do
643 site_packages_absolute_files+=("${root}/$(python_get_sitedir)/${file}") 665 site_packages_absolute_files+=("${root}$(python_get_sitedir)/${file}")
644 done 666 done
645 "$(get_python)" "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 667 "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1"
646 "$(get_python)" -O "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 668 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" &> /dev/null || return_code="1"
647 fi 669 fi
648 eend "${return_code}" 670 eend "${return_code}"
649 fi 671 fi
650 unset site_packages_absolute_dirs site_packages_absolute_files 672 unset site_packages_absolute_dirs site_packages_absolute_files
651 done 673 done
655 677
656 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 678 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
657 return_code="0" 679 return_code="0"
658 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..." 680 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..."
659 if ((${#other_dirs[@]})); then 681 if ((${#other_dirs[@]})); then
660 python${PYVER} "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 682 python${PYVER} "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1"
661 python${PYVER} -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 683 python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
662 fi 684 fi
663 if ((${#other_files[@]})); then 685 if ((${#other_files[@]})); then
664 python${PYVER} "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 686 python${PYVER} "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1"
665 python${PYVER} -O "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 687 python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1"
666 fi 688 fi
667 eend "${return_code}" 689 eend "${return_code}"
668 fi 690 fi
669 else 691 else
670 local myroot mydirs=() myfiles=() myopts=() 692 local myroot mydirs=() myfiles=() myopts=() return_code="0"
671 693
672 # strip trailing slash 694 # strip trailing slash
673 myroot="${ROOT%/}" 695 myroot="${ROOT%/}"
674 696
675 # respect ROOT and options passed to compileall.py 697 # respect ROOT and options passed to compileall.py
713 735
714 ebegin "Byte compiling python modules for python-${PYVER} .." 736 ebegin "Byte compiling python modules for python-${PYVER} .."
715 if ((${#mydirs[@]})); then 737 if ((${#mydirs[@]})); then
716 python${PYVER} \ 738 python${PYVER} \
717 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 739 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
718 "${myopts[@]}" "${mydirs[@]}" 740 "${myopts[@]}" "${mydirs[@]}" || return_code="1"
719 python${PYVER} -O \ 741 python${PYVER} -O \
720 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 742 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
721 "${myopts[@]}" "${mydirs[@]}" 743 "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code="1"
722 fi 744 fi
723 745
724 if ((${#myfiles[@]})); then 746 if ((${#myfiles[@]})); then
725 python_mod_compile "${myfiles[@]}" 747 python_mod_compile "${myfiles[@]}"
726 fi 748 fi
727 749
728 eend $? 750 eend "${return_code}"
729 fi 751 fi
730} 752}
731 753
732# @FUNCTION: python_mod_cleanup 754# @FUNCTION: python_mod_cleanup
733# @USAGE: [directory] 755# @USAGE: [directory]
756 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories" 778 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories"
757 elif [[ "$1" =~ ^/ ]]; then 779 elif [[ "$1" =~ ^/ ]]; then
758 SEARCH_PATH+=("${root}/${1#/}") 780 SEARCH_PATH+=("${root}/${1#/}")
759 else 781 else
760 for PYTHON_ABI in ${PYTHON_ABIS}; do 782 for PYTHON_ABI in ${PYTHON_ABIS}; do
761 SEARCH_PATH+=("${root}/$(python_get_sitedir)/$1") 783 SEARCH_PATH+=("${root}$(python_get_sitedir)/$1")
762 done 784 done
763 fi 785 fi
764 shift 786 shift
765 done 787 done
766 else 788 else
770 else 792 else
771 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages) 793 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages)
772 fi 794 fi
773 795
774 for path in "${SEARCH_PATH[@]}"; do 796 for path in "${SEARCH_PATH[@]}"; do
797 [[ ! -d "${path}" ]] && continue
775 einfo "Cleaning orphaned Python bytecode from ${path} .." 798 einfo "Cleaning orphaned Python bytecode from ${path} .."
776 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do 799 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do
777 src_py="${REPLY%[co]}" 800 src_py="${REPLY%[co]}"
778 [[ -f "${src_py}" ]] && continue 801 [[ -f "${src_py}" || (! -f "${src_py}c" && ! -f "${src_py}o") ]] && continue
779 einfo "Purging ${src_py}[co]" 802 einfo "Purging ${src_py}[co]"
780 rm -f "${src_py}"[co] 803 rm -f "${src_py}"[co]
781 done 804 done
782 805
783 # Attempt to remove directories that may be empty. 806 # Attempt to remove directories that may be empty.
784 find "${path}" -type d | sort -r | while read -r dir; do 807 find "${path}" -type d | sort -r | while read -r dir; do
785 rmdir "${dir}" 2>/dev/null 808 rmdir "${dir}" 2>/dev/null && einfo "Removing empty directory ${dir}"
786 done 809 done
787 done 810 done
788} 811}

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.66

  ViewVC Help
Powered by ViewVC 1.1.20