/[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.68
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.68 2009/08/31 00:07:37 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
126 PYTHON_ABI_SUPPORTED_VALUES="2.4 2.5 2.6 2.7 3.0 3.1 3.2" 132 PYTHON_ABI_SUPPORTED_VALUES="2.4 2.5 2.6 2.7 3.0 3.1 3.2"
133
134 if declare -p | grep "^declare -x USE_PYTHON=" > /dev/null; then
135 if [[ -z "${USE_PYTHON}" ]]; then
136 die "USE_PYTHON variable is empty"
137 fi
138
127 for ABI in ${USE_PYTHON}; do 139 for ABI in ${USE_PYTHON}; do
128 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then 140 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then
129 ewarn "Ignoring unsupported Python ABI '${ABI}'" 141 die "USE_PYTHON variable contains invalid value '${ABI}'"
130 continue
131 fi 142 fi
132 support_ABI="1" 143 support_ABI="1"
144 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
145 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${ABI}', '${restricted_ABI}'))"; then
146 support_ABI="0"
147 break
148 fi
149 done
150 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}"
151 done
152 export PYTHON_ABIS="${supported_PYTHON_ABIS# }"
153
154 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
155 die "USE_PYTHON variable doesn't enable any Python version supported by ${CATEGORY}/${PF}"
156 fi
157 else
158 local restricted_ABI
159 python_version
160
133 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do 161 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
134 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${ABI}', '${restricted_ABI}'))"; then 162 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${PYVER}', '${restricted_ABI}'))"; then
135 support_ABI="0" 163 die "Active Python version isn't supported by ${CATEGORY}/${PF}"
136 break
137 fi 164 fi
138 done 165 done
139 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}"
140 done
141 export PYTHON_ABIS="${supported_PYTHON_ABIS# }"
142 fi
143
144 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
145 python_version
146 export PYTHON_ABIS="${PYVER}" 166 export PYTHON_ABIS="${PYVER}"
147 fi 167 fi
168 fi
169
170 # Ensure that EPYTHON variable is respected.
171 local PYTHON_ABI
172 for PYTHON_ABI in ${PYTHON_ABIS}; do
173 if [[ "$(EPYTHON="$(PYTHON)" python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" != "${PYTHON_ABI}" ]]; then
174 die "'python' doesn't respect EPYTHON variable"
175 fi
176 done
148} 177}
149 178
150# @FUNCTION: python_copy_sources 179# @FUNCTION: python_copy_sources
151# @USAGE: [directory] 180# @USAGE: [directory]
152# @DESCRIPTION: 181# @DESCRIPTION:
… …
176# @DESCRIPTION: 205# @DESCRIPTION:
177# Create build directory symlink. 206# Create build directory symlink.
178python_set_build_dir_symlink() { 207python_set_build_dir_symlink() {
179 local dir="$1" 208 local dir="$1"
180 209
181 [[ -z "${PYTHON_ABIS}" ]] && die "PYTHON_ABIS variable not set" 210 [[ -z "${PYTHON_ABI}" ]] && die "PYTHON_ABI variable not set"
182 [[ -z "${dir}" ]] && dir="build" 211 [[ -z "${dir}" ]] && dir="build"
183 212
184 # Don't delete preexistent directories. 213 # Don't delete preexistent directories.
185 rm -f "${dir}" || die "Deletion of '${dir}' failed" 214 rm -f "${dir}" || die "Deletion of '${dir}' failed"
186 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed" 215 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed"
… …
215 ;; 244 ;;
216 -s|--separate-build-dirs) 245 -s|--separate-build-dirs)
217 separate_build_dirs="1" 246 separate_build_dirs="1"
218 ;; 247 ;;
219 -*) 248 -*)
220 die "${FUNCNAME}(): Unrecognized option $1" 249 die "${FUNCNAME}(): Unrecognized option '$1'"
221 ;; 250 ;;
222 *) 251 *)
223 break 252 break
224 ;; 253 ;;
225 esac 254 esac
… …
230 if [[ "$#" -eq "0" ]]; then 259 if [[ "$#" -eq "0" ]]; then
231 die "${FUNCNAME}(): Missing function name" 260 die "${FUNCNAME}(): Missing function name"
232 fi 261 fi
233 function="$1" 262 function="$1"
234 shift 263 shift
264
265 if [[ -z "$(type -t "${function}")" ]]; then
266 die "${FUNCNAME}(): '${function}' function isn't defined"
267 fi
235 else 268 else
236 if [[ "$#" -ne "0" ]]; then 269 if [[ "$#" -ne "0" ]]; then
237 die "${FUNCNAME}(): --default-function option and function name cannot be specified simultaneously" 270 die "${FUNCNAME}(): '--default-function' option and function name cannot be specified simultaneously"
238 fi 271 fi
239 if has "${EAPI:-0}" 0 1; then 272 if has "${EAPI:-0}" 0 1; then
240 die "${FUNCNAME}(): --default-function option cannot be used in this EAPI" 273 die "${FUNCNAME}(): '--default-function' option cannot be used in this EAPI"
241 fi 274 fi
242 275
243 if [[ "${EBUILD_PHASE}" == "configure" ]]; then 276 if [[ "${EBUILD_PHASE}" == "configure" ]]; then
277 if has "${EAPI}" 2; then
244 python_default_function() { 278 python_default_function() {
245 econf 279 econf
246 } 280 }
281 else
282 python_default_function() {
283 nonfatal econf
284 }
285 fi
247 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then 286 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then
248 python_default_function() { 287 python_default_function() {
249 emake 288 emake
250 } 289 }
251 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 290 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
… …
301 else 340 else
302 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..." 341 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..."
303 fi 342 fi
304 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}" 343 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}"
305 fi 344 fi
345
306 if [[ "${separate_build_dirs}" == "1" ]]; then 346 if [[ "${separate_build_dirs}" == "1" ]]; then
307 export BUILDDIR="${S}-${PYTHON_ABI}" 347 export BUILDDIR="${S}-${PYTHON_ABI}"
308 pushd "${BUILDDIR}" > /dev/null || die "pushd failed" 348 pushd "${BUILDDIR}" > /dev/null || die "pushd failed"
309 else 349 else
310 export BUILDDIR="${S}" 350 export BUILDDIR="${S}"
311 fi 351 fi
352
353 if ! has "${EAPI}" 0 1 2 && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
354 EPYTHON="$(PYTHON)" nonfatal "${function}" "$@"
355 else
312 if ! EPYTHON="$(PYTHON)" "${function}" "$@"; then 356 EPYTHON="$(PYTHON)" "${function}" "$@"
357 fi
358
359 if [[ "$?" != "0" ]]; then
313 if [[ -n "${failure_message_template}" ]]; then 360 if [[ -n "${failure_message_template}" ]]; then
314 failure_message="$(eval echo -n "${failure_message_template}")" 361 failure_message="$(eval echo -n "${failure_message_template}")"
315 else 362 else
316 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function" 363 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function"
317 fi 364 fi
365
318 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then 366 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
319 local ABI enabled_PYTHON_ABIS 367 local ABI enabled_PYTHON_ABIS
320 for ABI in ${PYTHON_ABIS}; do 368 for ABI in ${PYTHON_ABIS}; do
321 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}" 369 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}"
322 done 370 done
… …
326 fi 374 fi
327 else 375 else
328 die "${failure_message}" 376 die "${failure_message}"
329 fi 377 fi
330 fi 378 fi
379
331 if [[ "${separate_build_dirs}" == "1" ]]; then 380 if [[ "${separate_build_dirs}" == "1" ]]; then
332 popd > /dev/null || die "popd failed" 381 popd > /dev/null || die "popd failed"
333 fi 382 fi
334 unset BUILDDIR 383 unset BUILDDIR
335 done 384 done
… …
358 407
359# @FUNCTION: python_pkg_setup 408# @FUNCTION: python_pkg_setup
360# @DESCRIPTION: 409# @DESCRIPTION:
361# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags 410# 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. 411# 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 412if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then
364 python_pkg_setup_fail() { 413 python_pkg_setup_fail() {
365 eerror "${1}" 414 eerror "${1}"
366 die "${1}" 415 die "${1}"
367 } 416 }
368 417
… …
410 fi 459 fi
411 DEPEND="${PYTHON_USE_WITH_ATOM}" 460 DEPEND="${PYTHON_USE_WITH_ATOM}"
412 RDEPEND="${PYTHON_USE_WITH_ATOM}" 461 RDEPEND="${PYTHON_USE_WITH_ATOM}"
413fi 462fi
414 463
464# @ECLASS-VARIABLE: PYTHON_DEFINE_DEFAULT_FUNCTIONS
465# @DESCRIPTION:
466# Set this to define default functions for the following ebuild phases:
467# src_prepare, src_configure, src_compile, src_test, src_install.
468if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_DEFINE_DEFAULT_FUNCTIONS}" ]]; then
469 python_src_prepare() {
470 python_copy_sources
471 }
472
473 for python_default_function in src_configure src_compile src_test src_install; do
474 eval "python_${python_default_function}() { python_execute_function -d -s; }"
475 done
476 unset python_default_function
477
478 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
479fi
480
415# @FUNCTION: python_disable_pyc 481# @FUNCTION: python_disable_pyc
416# @DESCRIPTION: 482# @DESCRIPTION:
417# Tells python not to automatically recompile modules to .pyc/.pyo 483# Tell Python not to automatically recompile modules to .pyc/.pyo
418# even if the timestamps/version stamps don't match. This is done 484# even if the timestamps/version stamps don't match. This is done
419# to protect sandbox. 485# to protect sandbox.
420#
421# note: supported by >=dev-lang/python-2.2.3-r3 only.
422#
423python_disable_pyc() { 486python_disable_pyc() {
424 export PYTHONDONTWRITEBYTECODE=1 # For 2.6 and above 487 export PYTHONDONTWRITEBYTECODE="1"
425 export PYTHON_DONTCOMPILE=1 # For 2.5 and below
426} 488}
427 489
428# @FUNCTION: python_enable_pyc 490# @FUNCTION: python_enable_pyc
429# @DESCRIPTION: 491# @DESCRIPTION:
430# Tells python to automatically recompile modules to .pyc/.pyo if the 492# Tell Python to automatically recompile modules to .pyc/.pyo if the
431# timestamps/version stamps change 493# timestamps/version stamps have changed.
432python_enable_pyc() { 494python_enable_pyc() {
433 unset PYTHONDONTWRITEBYTECODE 495 unset PYTHONDONTWRITEBYTECODE
434 unset PYTHON_DONTCOMPILE
435} 496}
436 497
437python_disable_pyc 498python_disable_pyc
438 499
439# @FUNCTION: python_need_rebuild 500# @FUNCTION: python_need_rebuild
… …
471# @FUNCTION: python_get_sitedir 532# @FUNCTION: python_get_sitedir
472# @DESCRIPTION: 533# @DESCRIPTION:
473# Run without arguments, returns the Python site-packages directory. 534# Run without arguments, returns the Python site-packages directory.
474python_get_sitedir() { 535python_get_sitedir() {
475 echo "$(python_get_libdir)/site-packages" 536 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} 537}
486 538
487# @FUNCTION: python_tkinter_exists 539# @FUNCTION: python_tkinter_exists
488# @DESCRIPTION: 540# @DESCRIPTION:
489# Run without arguments, checks if python was compiled with Tkinter 541# Run without arguments, checks if python was compiled with Tkinter
… …
550 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}") 602 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}")
551 done 603 done
552 604
553 if ((${#myfiles[@]})); then 605 if ((${#myfiles[@]})); then
554 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 606 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[@]}" 607 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" &> /dev/null
556 else 608 else
557 ewarn "No files to compile!" 609 ewarn "No files to compile!"
558 fi 610 fi
559} 611}
560 612
… …
608 else 660 else
609 ewarn "'${root}/$1' doesn't exist!" 661 ewarn "'${root}/$1' doesn't exist!"
610 fi 662 fi
611 else 663 else
612 for PYTHON_ABI in ${PYTHON_ABIS}; do 664 for PYTHON_ABI in ${PYTHON_ABIS}; do
613 if [[ -d "${root}/$(python_get_sitedir)/$1" ]]; then 665 if [[ -d "${root}$(python_get_sitedir)/$1" ]]; then
614 site_packages_dirs+=("$1") 666 site_packages_dirs+=("$1")
615 break 667 break
616 elif [[ -f "${root}/$(python_get_sitedir)/$1" ]]; then 668 elif [[ -f "${root}$(python_get_sitedir)/$1" ]]; then
617 site_packages_files+=("$1") 669 site_packages_files+=("$1")
618 break 670 break
619 elif [[ -e "${root}/$(python_get_sitedir)/$1" ]]; then 671 elif [[ -e "${root}$(python_get_sitedir)/$1" ]]; then
620 ewarn "'$1' is not a file or a directory!" 672 ewarn "'$1' is not a file or a directory!"
621 else 673 else
622 ewarn "'$1' doesn't exist!" 674 ewarn "'$1' doesn't exist!"
623 fi 675 fi
624 done 676 done
… …
635 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then 687 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then
636 return_code="0" 688 return_code="0"
637 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}" 689 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}"
638 if ((${#site_packages_dirs[@]})); then 690 if ((${#site_packages_dirs[@]})); then
639 for dir in "${site_packages_dirs[@]}"; do 691 for dir in "${site_packages_dirs[@]}"; do
640 site_packages_absolute_dirs+=("${root}/$(python_get_sitedir)/${dir}") 692 site_packages_absolute_dirs+=("${root}$(python_get_sitedir)/${dir}")
641 done 693 done
642 "$(PYTHON)" "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 694 "$(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" 695 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" &> /dev/null || return_code="1"
644 fi 696 fi
645 if ((${#site_packages_files[@]})); then 697 if ((${#site_packages_files[@]})); then
646 for file in "${site_packages_files[@]}"; do 698 for file in "${site_packages_files[@]}"; do
647 site_packages_absolute_files+=("${root}/$(python_get_sitedir)/${file}") 699 site_packages_absolute_files+=("${root}$(python_get_sitedir)/${file}")
648 done 700 done
649 "$(PYTHON)" "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 701 "$(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" 702 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" &> /dev/null || return_code="1"
651 fi 703 fi
652 eend "${return_code}" 704 eend "${return_code}"
653 fi 705 fi
654 unset site_packages_absolute_dirs site_packages_absolute_files 706 unset site_packages_absolute_dirs site_packages_absolute_files
655 done 707 done
… …
659 711
660 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 712 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
661 return_code="0" 713 return_code="0"
662 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..." 714 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..."
663 if ((${#other_dirs[@]})); then 715 if ((${#other_dirs[@]})); then
664 python${PYVER} "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 716 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" 717 python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
666 fi 718 fi
667 if ((${#other_files[@]})); then 719 if ((${#other_files[@]})); then
668 python${PYVER} "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 720 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" 721 python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1"
670 fi 722 fi
671 eend "${return_code}" 723 eend "${return_code}"
672 fi 724 fi
673 else 725 else
674 local myroot mydirs=() myfiles=() myopts=() 726 local myroot mydirs=() myfiles=() myopts=() return_code="0"
675 727
676 # strip trailing slash 728 # strip trailing slash
677 myroot="${ROOT%/}" 729 myroot="${ROOT%/}"
678 730
679 # respect ROOT and options passed to compileall.py 731 # respect ROOT and options passed to compileall.py
… …
717 769
718 ebegin "Byte compiling python modules for python-${PYVER} .." 770 ebegin "Byte compiling python modules for python-${PYVER} .."
719 if ((${#mydirs[@]})); then 771 if ((${#mydirs[@]})); then
720 python${PYVER} \ 772 python${PYVER} \
721 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 773 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
722 "${myopts[@]}" "${mydirs[@]}" 774 "${myopts[@]}" "${mydirs[@]}" || return_code="1"
723 python${PYVER} -O \ 775 python${PYVER} -O \
724 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 776 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
725 "${myopts[@]}" "${mydirs[@]}" 777 "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code="1"
726 fi 778 fi
727 779
728 if ((${#myfiles[@]})); then 780 if ((${#myfiles[@]})); then
729 python_mod_compile "${myfiles[@]}" 781 python_mod_compile "${myfiles[@]}"
730 fi 782 fi
731 783
732 eend $? 784 eend "${return_code}"
733 fi 785 fi
734} 786}
735 787
736# @FUNCTION: python_mod_cleanup 788# @FUNCTION: python_mod_cleanup
737# @USAGE: [directory] 789# @USAGE: [directory]
… …
760 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories" 812 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories"
761 elif [[ "$1" =~ ^/ ]]; then 813 elif [[ "$1" =~ ^/ ]]; then
762 SEARCH_PATH+=("${root}/${1#/}") 814 SEARCH_PATH+=("${root}/${1#/}")
763 else 815 else
764 for PYTHON_ABI in ${PYTHON_ABIS}; do 816 for PYTHON_ABI in ${PYTHON_ABIS}; do
765 SEARCH_PATH+=("${root}/$(python_get_sitedir)/$1") 817 SEARCH_PATH+=("${root}$(python_get_sitedir)/$1")
766 done 818 done
767 fi 819 fi
768 shift 820 shift
769 done 821 done
770 else 822 else
… …
774 else 826 else
775 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages) 827 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages)
776 fi 828 fi
777 829
778 for path in "${SEARCH_PATH[@]}"; do 830 for path in "${SEARCH_PATH[@]}"; do
831 [[ ! -d "${path}" ]] && continue
779 einfo "Cleaning orphaned Python bytecode from ${path} .." 832 einfo "Cleaning orphaned Python bytecode from ${path} .."
780 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do 833 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do
781 src_py="${REPLY%[co]}" 834 src_py="${REPLY%[co]}"
782 [[ -f "${src_py}" ]] && continue 835 [[ -f "${src_py}" || (! -f "${src_py}c" && ! -f "${src_py}o") ]] && continue
783 einfo "Purging ${src_py}[co]" 836 einfo "Purging ${src_py}[co]"
784 rm -f "${src_py}"[co] 837 rm -f "${src_py}"[co]
785 done 838 done
786 839
787 # Attempt to remove directories that may be empty. 840 # Attempt to remove directories that may be empty.
788 find "${path}" -type d | sort -r | while read -r dir; do 841 find "${path}" -type d | sort -r | while read -r dir; do
789 rmdir "${dir}" 2>/dev/null 842 rmdir "${dir}" 2>/dev/null && einfo "Removing empty directory ${dir}"
790 done 843 done
791 done 844 done
792} 845}
Legend:
Removed from v.1.60  
changed lines
  Added in v.1.68
  ViewVC Help
Powered by ViewVC 1.1.13