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

Diff of /eclass/python.eclass

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

Revision 1.136 Revision 1.156
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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.136 2011/10/07 10:53:14 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.156 2012/08/16 07:46:15 patrick Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Gentoo Python Project <python@gentoo.org> 7# Gentoo Python Project <python@gentoo.org>
8# @BLURB: Eclass for Python packages 8# @BLURB: Eclass for Python packages
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The python eclass contains miscellaneous, useful functions for Python packages. 10# The python eclass contains miscellaneous, useful functions for Python packages.
11 11
12# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
13if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 14 inherit multilib
15fi
13 16
17# Export pkg_setup every time to avoid issues with eclass inheritance order.
18if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
19 EXPORT_FUNCTIONS pkg_setup
20fi
21
22# Avoid processing this eclass more than once.
23if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
24_PYTHON_ECLASS_INHERITED="1"
25
14if ! has "${EAPI:-0}" 0 1 2 3; then 26if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 27 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 28fi
17 29
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 30_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2) 31_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 32_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5) 33_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
22_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]}) 34_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
23 35
24# ================================================================================================ 36# ================================================================================================
25# ===================================== HANDLING OF METADATA ===================================== 37# ===================================== HANDLING OF METADATA =====================================
26# ================================================================================================ 38# ================================================================================================
86 98
87 return 1 99 return 1
88 fi 100 fi
89} 101}
90 102
103_python_implementation() {
104 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
105 return 0
106 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
107 return 0
108 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
109 return 0
110 else
111 return 1
112 fi
113}
114
91_python_package_supporting_installation_for_multiple_python_abis() { 115_python_package_supporting_installation_for_multiple_python_abis() {
92 if has "${EAPI:-0}" 0 1 2 3 4; then 116 if has "${EAPI:-0}" 0 1 2 3 4; then
93 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 117 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
94 return 0 118 return 0
95 else 119 else
231 else 255 else
232 die "Invalid syntax of PYTHON_DEPEND" 256 die "Invalid syntax of PYTHON_DEPEND"
233 fi 257 fi
234} 258}
235 259
260if _python_implementation; then
236DEPEND=">=app-admin/eselect-python-20091230" 261 DEPEND=">=app-admin/eselect-python-20091230"
237RDEPEND="${DEPEND}" 262 RDEPEND="${DEPEND}"
263 PDEPEND="app-admin/python-updater"
264fi
238 265
239if [[ -n "${PYTHON_DEPEND}" ]]; then 266if [[ -n "${PYTHON_DEPEND}" ]]; then
240 _python_parse_PYTHON_DEPEND 267 _python_parse_PYTHON_DEPEND
241else 268else
242 _PYTHON_ATOMS=("dev-lang/python") 269 _PYTHON_ATOMS=("dev-lang/python")
281 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" 308 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
282 fi 309 fi
283 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then 310 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
284 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" 311 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
285 fi 312 fi
286 DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 313 DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
287 RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 314 RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
288 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY 315 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
289fi 316fi
290 317
291unset _PYTHON_ATOMS 318unset _PYTHON_ATOMS
292 319
293# ================================================================================================ 320# ================================================================================================
294# =================================== MISCELLANEOUS FUNCTIONS ==================================== 321# =================================== MISCELLANEOUS FUNCTIONS ====================================
295# ================================================================================================ 322# ================================================================================================
296
297_python_implementation() {
298 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
299 return 0
300 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
301 return 0
302 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
303 return 0
304 else
305 return 1
306 fi
307}
308 323
309_python_abi-specific_local_scope() { 324_python_abi-specific_local_scope() {
310 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 325 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
311} 326}
312 327
384 _CYAN= 399 _CYAN=
385 _NORMAL= 400 _NORMAL=
386 fi 401 fi
387} 402}
388 403
389unset PYTHON_PKG_SETUP_EXECUTED
390
391_python_check_python_pkg_setup_execution() { 404_python_check_python_pkg_setup_execution() {
392 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 405 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
393 406
394 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 407 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
395 die "python_pkg_setup() not called" 408 die "python_pkg_setup() not called"
463 fi 476 fi
464 477
465 PYTHON_PKG_SETUP_EXECUTED="1" 478 PYTHON_PKG_SETUP_EXECUTED="1"
466} 479}
467 480
468if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
469 EXPORT_FUNCTIONS pkg_setup
470fi
471
472_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)' 481_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
473 482
474# @FUNCTION: python_convert_shebangs 483# @FUNCTION: python_convert_shebangs
475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 484# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
476# @DESCRIPTION: 485# @DESCRIPTION:
477# Convert shebangs in specified files. Directories can be specified only with --recursive option. 486# Convert shebangs in specified files. Directories can be specified only with --recursive option.
478python_convert_shebangs() { 487python_convert_shebangs() {
479 _python_check_python_pkg_setup_execution 488 _python_check_python_pkg_setup_execution
480 489
481 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 490 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
482 491
483 while (($#)); do 492 while (($#)); do
484 case "$1" in 493 case "$1" in
485 -r|--recursive) 494 -r|--recursive)
486 recursive="1" 495 recursive="1"
541 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 550 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
542 551
543 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 552 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
544 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue 553 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
545 554
555 shebangs_converted="1"
556
546 if [[ "${quiet}" == "0" ]]; then 557 if [[ "${quiet}" == "0" ]]; then
547 einfo "Converting shebang in '${file}'" 558 einfo "Converting shebang in '${file}'"
548 fi 559 fi
549 560
550 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 561 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
551 fi 562 fi
563 done
564
565 if [[ "${shebangs_converted}" == "0" ]]; then
566 ewarn "${FUNCNAME}(): Python scripts not found"
567 fi
568}
569
570# @FUNCTION: python_clean_py-compile_files
571# @USAGE: [-q|--quiet]
572# @DESCRIPTION:
573# Clean py-compile files to disable byte-compilation.
574python_clean_py-compile_files() {
575 _python_check_python_pkg_setup_execution
576
577 local file files=() quiet="0"
578
579 while (($#)); do
580 case "$1" in
581 -q|--quiet)
582 quiet="1"
583 ;;
584 -*)
585 die "${FUNCNAME}(): Unrecognized option '$1'"
586 ;;
587 *)
588 die "${FUNCNAME}(): Invalid usage"
589 ;;
590 esac
591 shift
592 done
593
594 while read -d $'\0' -r file; do
595 files+=("${file#./}")
596 done < <(find -name py-compile -type f -print0)
597
598 for file in "${files[@]}"; do
599 if [[ "${quiet}" == "0" ]]; then
600 einfo "Cleaning '${file}' file"
601 fi
602 echo "#!/bin/sh" > "${file}"
552 done 603 done
553} 604}
554 605
555# @FUNCTION: python_clean_installation_image 606# @FUNCTION: python_clean_installation_image
556# @USAGE: [-q|--quiet] 607# @USAGE: [-q|--quiet]
794 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 845 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
795 fi 846 fi
796 else 847 else
797 python3_version="" 848 python3_version=""
798 fi 849 fi
850 fi
851
852 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
853 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
854 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
855 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
856 eerror " dev-lang/python:${PYTHON_ABI}"
857 fi
858 done
859 die "No supported version of CPython installed"
799 fi 860 fi
800 861
801 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 862 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
802 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink" 863 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
803 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 864 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
961 python_default_function() { 1022 python_default_function() {
962 emake "$@" 1023 emake "$@"
963 } 1024 }
964 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1025 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
965 python_default_function() { 1026 python_default_function() {
1027 # Stolen from portage's _eapi0_src_test()
1028 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
966 if emake -j1 -n check &> /dev/null; then 1029 if ${emake_cmd} -j1 -n check &> /dev/null; then
967 emake -j1 check "$@" 1030 ${emake_cmd} -j1 check "$@"
968 elif emake -j1 -n test &> /dev/null; then 1031 elif ${emake_cmd} -j1 -n test &> /dev/null; then
969 emake -j1 test "$@" 1032 ${emake_cmd} -j1 test "$@"
970 fi 1033 fi
971 } 1034 }
972 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1035 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
973 python_default_function() { 1036 python_default_function() {
974 emake DESTDIR="${D}" install "$@" 1037 emake DESTDIR="${D}" install "$@"
1242cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)") 1305cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1243python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)") 1306python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1244python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1307python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1245 1308
1246pypy_versions_mapping = { 1309pypy_versions_mapping = {
1247 "1.5": "2.7" 1310 "1.5": "2.7",
1311 "1.6": "2.7",
1312 "1.7": "2.7",
1313 "1.8": "2.7",
1314 "1.9": "2.7",
1248} 1315}
1249 1316
1250def get_PYTHON_ABI(python_interpreter): 1317def get_PYTHON_ABI(python_interpreter):
1251 cpython_matched = cpython_interpreter_re.match(python_interpreter) 1318 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1252 jython_matched = jython_interpreter_re.match(python_interpreter) 1319 jython_matched = jython_interpreter_re.match(python_interpreter)
1592 fi 1659 fi
1593 done 1660 done
1594 1661
1595 popd > /dev/null || die "popd failed" 1662 popd > /dev/null || die "popd failed"
1596 1663
1664 # This is per bug #390691, without the duplication refactor, and with
1665 # the 3-way structure per comment #6. This enable users with old
1666 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1667 # before coreutils can be upgraded).
1597 if ROOT="/" has_version sys-apps/coreutils; then 1668 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1598 cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1669 cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1670 elif ROOT="/" has_version sys-apps/coreutils; then
1671 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1599 else 1672 else
1600 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1673 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1601 fi 1674 fi
1602 done 1675 done
1603 1676
1621 stdout = sys.stdout.buffer 1694 stdout = sys.stdout.buffer
1622else: 1695else:
1623 # Python 2 1696 # Python 2
1624 stdout = sys.stdout 1697 stdout = sys.stdout
1625 1698
1699python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1626files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1700files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1701python_wrapper_scripts_file.close()
1627 1702
1628for file in sorted(files): 1703for file in sorted(files):
1629 stdout.write(file) 1704 stdout.write(file)
1630 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1705 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1631 1706
2691 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2766 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2692 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2767 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2693 else 2768 else
2694 [[ -f "${py_file}" ]] && continue 2769 [[ -f "${py_file}" ]] && continue
2695 fi 2770 fi
2696 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}"
2697 rm -f "${compiled_file%[co]}"[co] 2771 rm -f "${compiled_file%[co]}"[co]
2698 elif [[ "${compiled_file}" == *\$py.class ]]; then 2772 elif [[ "${compiled_file}" == *\$py.class ]]; then
2699 if [[ "${dir}" == "__pycache__" ]]; then 2773 if [[ "${dir}" == "__pycache__" ]]; then
2700 base_module_name="${compiled_file##*/}" 2774 base_module_name="${compiled_file##*/}"
2701 base_module_name="${base_module_name%\$py.class}" 2775 base_module_name="${base_module_name%\$py.class}"
2706 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2780 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2707 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2781 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2708 else 2782 else
2709 [[ -f "${py_file}" ]] && continue 2783 [[ -f "${py_file}" ]] && continue
2710 fi 2784 fi
2711 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}"
2712 rm -f "${compiled_file}" 2785 rm -f "${compiled_file}"
2713 else 2786 else
2714 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'" 2787 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
2715 fi 2788 fi
2716 2789
2717 # Delete empty parent directories. 2790 # Delete empty parent directories.
2718 dir="${compiled_file%/*}" 2791 dir="${compiled_file%/*}"
2719 while [[ "${dir}" != "${root}" ]]; do 2792 while [[ "${dir}" != "${root}" ]]; do
2720 if rmdir "${dir}" 2> /dev/null; then 2793 if ! rmdir "${dir}" 2> /dev/null; then
2721 echo "${_CYAN}<<< ${dir}${_NORMAL}"
2722 else
2723 break 2794 break
2724 fi 2795 fi
2725 dir="${dir%/*}" 2796 dir="${dir%/*}"
2726 done 2797 done
2727 done 2798 done
2858 done 2929 done
2859 for dir in "${evaluated_dirs[@]}"; do 2930 for dir in "${evaluated_dirs[@]}"; do
2860 eval "dirs+=(\"\${root}${dir}\")" 2931 eval "dirs+=(\"\${root}${dir}\")"
2861 done 2932 done
2862 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2933 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2863 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2934 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2864 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2935 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2865 fi 2936 fi
2866 _python_clean_compiled_modules "${dirs[@]}" 2937 _python_clean_compiled_modules "${dirs[@]}"
2867 fi 2938 fi
2868 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2939 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2871 done 2942 done
2872 for file in "${evaluated_files[@]}"; do 2943 for file in "${evaluated_files[@]}"; do
2873 eval "files+=(\"\${root}${file}\")" 2944 eval "files+=(\"\${root}${file}\")"
2874 done 2945 done
2875 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2946 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2876 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2947 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2877 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2948 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2878 fi 2949 fi
2879 _python_clean_compiled_modules "${files[@]}" 2950 _python_clean_compiled_modules "${files[@]}"
2880 fi 2951 fi
2881 eend "${return_code}" 2952 eend "${return_code}"
2902 return_code="0" 2973 return_code="0"
2903 stderr="" 2974 stderr=""
2904 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2975 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2905 if ((${#other_dirs[@]})); then 2976 if ((${#other_dirs[@]})); then
2906 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2977 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2907 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2978 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2908 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2979 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2909 fi 2980 fi
2910 _python_clean_compiled_modules "${other_dirs[@]}" 2981 _python_clean_compiled_modules "${other_dirs[@]}"
2911 fi 2982 fi
2912 if ((${#other_files[@]})); then 2983 if ((${#other_files[@]})); then
2913 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2984 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2914 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2985 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2915 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1" 2986 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2916 fi 2987 fi
2917 _python_clean_compiled_modules "${other_files[@]}" 2988 _python_clean_compiled_modules "${other_files[@]}"
2918 fi 2989 fi
2919 eend "${return_code}" 2990 eend "${return_code}"
3106} 3177}
3107 3178
3108# ================================================================================================ 3179# ================================================================================================
3109# ===================================== DEPRECATED FUNCTIONS ===================================== 3180# ===================================== DEPRECATED FUNCTIONS =====================================
3110# ================================================================================================ 3181# ================================================================================================
3182
3183fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.136  
changed lines
  Added in v.1.156

  ViewVC Help
Powered by ViewVC 1.1.20