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

Diff of /eclass/python.eclass

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

Revision 1.116 Revision 1.121
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.116 2011/07/04 11:27:53 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.121 2011/07/08 07:41:56 djc 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
21_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]}) 21_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]})
22 22
23# ================================================================================================ 23# ================================================================================================
24# ===================================== HANDLING OF METADATA ===================================== 24# ===================================== HANDLING OF METADATA =====================================
25# ================================================================================================ 25# ================================================================================================
26
27_PYTHON_ABI_PATTERN_REGEX="([[:alnum:]]|\.|-|\*|\[|\])+"
26 28
27_python_check_python_abi_matching() { 29_python_check_python_abi_matching() {
28 local pattern patterns patterns_list="0" PYTHON_ABI 30 local pattern patterns patterns_list="0" PYTHON_ABI
29 31
30 while (($#)); do 32 while (($#)); do
76 return 0 78 return 0
77 fi 79 fi
78 done <<< "${patterns}" 80 done <<< "${patterns}"
79 81
80 return 1 82 return 1
83 fi
84}
85
86_python_package_supporting_installation_for_multiple_python_abis() {
87 if has "${EAPI:-0}" 0 1 2 3 4; then
88 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
89 return 0
90 else
91 return 1
92 fi
93 else
94 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
81 fi 95 fi
82} 96}
83 97
84# @ECLASS-VARIABLE: PYTHON_DEPEND 98# @ECLASS-VARIABLE: PYTHON_DEPEND
85# @DESCRIPTION: 99# @DESCRIPTION:
283 else 297 else
284 return 1 298 return 1
285 fi 299 fi
286} 300}
287 301
288_python_package_supporting_installation_for_multiple_python_abis() {
289 if [[ "${EBUILD_PHASE}" == "depend" ]]; then
290 die "${FUNCNAME}() cannot be used in global scope"
291 fi
292
293 if has "${EAPI:-0}" 0 1 2 3 4; then
294 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
295 return 0
296 else
297 return 1
298 fi
299 else
300 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
301 fi
302}
303
304_python_abi-specific_local_scope() { 302_python_abi-specific_local_scope() {
305 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 303 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
306} 304}
307 305
308_python_initialize_prefix_variables() { 306_python_initialize_prefix_variables() {
706 fi 704 fi
707 705
708 _python_initial_sanity_checks 706 _python_initial_sanity_checks
709 707
710 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4; then 708 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4; then
711 local PYTHON_ABI restricted_ABI restricted_ABIs support_ABI supported_PYTHON_ABIS 709 local PYTHON_ABI
712
713 restricted_ABIs="${RESTRICT_PYTHON_ABIS// /$'\n'}"
714 710
715 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then 711 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
716 local cpython_enabled="0" 712 local cpython_enabled="0"
717 713
718 if [[ -z "${USE_PYTHON}" ]]; then 714 if [[ -z "${USE_PYTHON}" ]]; then
726 722
727 if has "${PYTHON_ABI}" "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; then 723 if has "${PYTHON_ABI}" "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; then
728 cpython_enabled="1" 724 cpython_enabled="1"
729 fi 725 fi
730 726
731 support_ABI="1"
732 while read restricted_ABI; do
733 if _python_check_python_abi_matching "${PYTHON_ABI}" "${restricted_ABI}"; then 727 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
734 support_ABI="0" 728 export PYTHON_ABIS+="${PYTHON_ABIS:+ }${PYTHON_ABI}"
735 break
736 fi 729 fi
737 done <<< "${restricted_ABIs}"
738 [[ "${support_ABI}" == "1" ]] && export PYTHON_ABIS+="${PYTHON_ABIS:+ }${PYTHON_ABI}"
739 done 730 done
740 731
741 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then 732 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
742 die "USE_PYTHON variable does not enable any Python ABI supported by ${CATEGORY}/${PF}" 733 die "USE_PYTHON variable does not enable any Python ABI supported by ${CATEGORY}/${PF}"
743 fi 734 fi
759 die "'${EPREFIX}/usr/bin/python2' is not valid symlink" 750 die "'${EPREFIX}/usr/bin/python2' is not valid symlink"
760 fi 751 fi
761 752
762 python2_version="$("${EPREFIX}/usr/bin/python2" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')" 753 python2_version="$("${EPREFIX}/usr/bin/python2" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')"
763 754
755 support_python_major_version="0"
764 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}"; do 756 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}"; do
757 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
765 support_python_major_version="1" 758 support_python_major_version="1"
766 while read restricted_ABI; do 759 break
767 if _python_check_python_abi_matching "${PYTHON_ABI}" "${restricted_ABI}"; then
768 support_python_major_version="0"
769 fi 760 fi
770 done <<< "${restricted_ABIs}"
771 [[ "${support_python_major_version}" == "1" ]] && break
772 done 761 done
773 if [[ "${support_python_major_version}" == "1" ]]; then 762 if [[ "${support_python_major_version}" == "1" ]]; then
774 while read restricted_ABI; do
775 if _python_check_python_abi_matching "${python2_version}" "${restricted_ABI}"; then 763 if _python_check_python_abi_matching --patterns-list "${python2_version}" "${RESTRICT_PYTHON_ABIS}"; then
776 die "Active version of CPython 2 is not supported by ${CATEGORY}/${PF}" 764 die "Active version of CPython 2 is not supported by ${CATEGORY}/${PF}"
777 fi 765 fi
778 done <<< "${restricted_ABIs}"
779 else 766 else
780 python2_version="" 767 python2_version=""
781 fi 768 fi
782 fi 769 fi
783 770
786 die "'${EPREFIX}/usr/bin/python3' is not valid symlink" 773 die "'${EPREFIX}/usr/bin/python3' is not valid symlink"
787 fi 774 fi
788 775
789 python3_version="$("${EPREFIX}/usr/bin/python3" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')" 776 python3_version="$("${EPREFIX}/usr/bin/python3" -c 'from sys import version_info; print(".".join(str(x) for x in version_info[:2]))')"
790 777
778 support_python_major_version="0"
791 for PYTHON_ABI in "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do 779 for PYTHON_ABI in "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
780 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
792 support_python_major_version="1" 781 support_python_major_version="1"
793 while read restricted_ABI; do 782 break
794 if _python_check_python_abi_matching "${PYTHON_ABI}" "${restricted_ABI}"; then
795 support_python_major_version="0"
796 fi 783 fi
797 done <<< "${restricted_ABIs}"
798 [[ "${support_python_major_version}" == "1" ]] && break
799 done 784 done
800 if [[ "${support_python_major_version}" == "1" ]]; then 785 if [[ "${support_python_major_version}" == "1" ]]; then
801 while read restricted_ABI; do
802 if _python_check_python_abi_matching "${python3_version}" "${restricted_ABI}"; then 786 if _python_check_python_abi_matching --patterns-list "${python3_version}" "${RESTRICT_PYTHON_ABIS}"; then
803 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 787 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
804 fi 788 fi
805 done <<< "${restricted_ABIs}"
806 else 789 else
807 python3_version="" 790 python3_version=""
808 fi 791 fi
809 fi 792 fi
810 793
835 eval "_PYTHON_SAVED_${variable}=\"\${!variable}\"" 818 eval "_PYTHON_SAVED_${variable}=\"\${!variable}\""
836 for prefix in PYTHON_USER_ PYTHON_; do 819 for prefix in PYTHON_USER_ PYTHON_; do
837 if [[ "$(declare -p ${prefix}${variable} 2> /dev/null)" == "declare -a ${prefix}${variable}="* ]]; then 820 if [[ "$(declare -p ${prefix}${variable} 2> /dev/null)" == "declare -a ${prefix}${variable}="* ]]; then
838 eval "array=(\"\${${prefix}${variable}[@]}\")" 821 eval "array=(\"\${${prefix}${variable}[@]}\")"
839 for element in "${array[@]}"; do 822 for element in "${array[@]}"; do
840 if [[ "${element}" =~ ^([[:alnum:]]|\.|-|\*|\[|\])+\ (\+|-)\ .+ ]]; then 823 if [[ "${element}" =~ ^${_PYTHON_ABI_PATTERN_REGEX}\ (\+|-)\ .+ ]]; then
841 pattern="${element%% *}" 824 pattern="${element%% *}"
842 element="${element#* }" 825 element="${element#* }"
843 operator="${element%% *}" 826 operator="${element%% *}"
844 flags="${element#* }" 827 flags="${element#* }"
845 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then 828 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
2152 die "${FUNCNAME}(): Jython does not have shared library" 2135 die "${FUNCNAME}(): Jython does not have shared library"
2153 fi 2136 fi
2154} 2137}
2155 2138
2156# @FUNCTION: python_get_version 2139# @FUNCTION: python_get_version
2157# @USAGE: [-f|--final-ABI] [--full] [--major] [--minor] [--micro] 2140# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
2158# @DESCRIPTION: 2141# @DESCRIPTION:
2159# Print Python version. 2142# Print Python version.
2160# --full, --major, --minor and --micro options cannot be specified simultaneously. 2143# --full, --major, --minor and --micro options cannot be specified simultaneously.
2161# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed. 2144# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed.
2145# If --language option is specified, then Python language version is printed.
2146# --language and --full options cannot be specified simultaneously.
2147# --language and --micro options cannot be specified simultaneously.
2162# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2148# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2163python_get_version() { 2149python_get_version() {
2164 _python_check_python_pkg_setup_execution 2150 _python_check_python_pkg_setup_execution
2165 2151
2166 local final_ABI="0" full="0" major="0" minor="0" micro="0" python_command 2152 local final_ABI="0" language="0" language_version full="0" major="0" minor="0" micro="0" PYTHON_ABI="${PYTHON_ABI}" python_command
2167 2153
2168 while (($#)); do 2154 while (($#)); do
2169 case "$1" in 2155 case "$1" in
2170 -f|--final-ABI) 2156 -f|--final-ABI)
2171 final_ABI="1" 2157 final_ABI="1"
2172 ;; 2158 ;;
2159 -l|--language)
2160 language="1"
2161 ;;
2173 --full) 2162 --full)
2174 full="1" 2163 full="1"
2175 ;; 2164 ;;
2176 --major) 2165 --major)
2177 major="1" 2166 major="1"
2189 die "${FUNCNAME}(): Invalid usage" 2178 die "${FUNCNAME}(): Invalid usage"
2190 ;; 2179 ;;
2191 esac 2180 esac
2192 shift 2181 shift
2193 done 2182 done
2194
2195 if [[ "$((${full} + ${major} + ${minor} + ${micro}))" -gt 1 ]]; then
2196 die "${FUNCNAME}(): '--full', '--major', '--minor' or '--micro' options cannot be specified simultaneously"
2197 fi
2198
2199 if [[ "${full}" == "1" ]]; then
2200 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))"
2201 elif [[ "${major}" == "1" ]]; then
2202 python_command="from sys import version_info; print(version_info[0])"
2203 elif [[ "${minor}" == "1" ]]; then
2204 python_command="from sys import version_info; print(version_info[1])"
2205 elif [[ "${micro}" == "1" ]]; then
2206 python_command="from sys import version_info; print(version_info[2])"
2207 else
2208 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2209 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2210 echo "${PYTHON_ABI}"
2211 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2212 echo "${PYTHON_ABI%-jython}"
2213 fi
2214 return
2215 fi
2216 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2217 fi
2218 2183
2219 if [[ "${final_ABI}" == "1" ]]; then 2184 if [[ "${final_ABI}" == "1" ]]; then
2220 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2185 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2221 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 2186 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2222 fi 2187 fi
2223 "$(PYTHON -f)" -c "${python_command}"
2224 else 2188 else
2225 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2189 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then
2226 die "${FUNCNAME}() should be used in ABI-specific local scope" 2190 die "${FUNCNAME}() should be used in ABI-specific local scope"
2227 fi 2191 fi
2192 fi
2193
2194 if [[ "$((${full} + ${major} + ${minor} + ${micro}))" -gt 1 ]]; then
2195 die "${FUNCNAME}(): '--full', '--major', '--minor' or '--micro' options cannot be specified simultaneously"
2196 fi
2197
2198 if [[ "${language}" == "1" ]]; then
2199 if [[ "${final_ABI}" == "1" ]]; then
2200 PYTHON_ABI="$(PYTHON -f --ABI)"
2201 elif [[ -z "${PYTHON_ABI}" ]]; then
2202 PYTHON_ABI="$(PYTHON --ABI)"
2203 fi
2204 language_version="${PYTHON_ABI%%-*}"
2205 if [[ "${full}" == "1" ]]; then
2206 die "${FUNCNAME}(): '--language' and '--full' options cannot be specified simultaneously"
2207 elif [[ "${major}" == "1" ]]; then
2208 echo "${language_version%.*}"
2209 elif [[ "${minor}" == "1" ]]; then
2210 echo "${language_version#*.}"
2211 elif [[ "${micro}" == "1" ]]; then
2212 die "${FUNCNAME}(): '--language' and '--micro' options cannot be specified simultaneously"
2213 else
2214 echo "${language_version}"
2215 fi
2216 else
2217 if [[ "${full}" == "1" ]]; then
2218 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))"
2219 elif [[ "${major}" == "1" ]]; then
2220 python_command="from sys import version_info; print(version_info[0])"
2221 elif [[ "${minor}" == "1" ]]; then
2222 python_command="from sys import version_info; print(version_info[1])"
2223 elif [[ "${micro}" == "1" ]]; then
2224 python_command="from sys import version_info; print(version_info[2])"
2225 else
2226 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2227 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2228 echo "${PYTHON_ABI}"
2229 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2230 echo "${PYTHON_ABI%-jython}"
2231 fi
2232 return
2233 fi
2234 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2235 fi
2236
2237 if [[ "${final_ABI}" == "1" ]]; then
2238 "$(PYTHON -f)" -c "${python_command}"
2239 else
2228 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}" 2240 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}"
2241 fi
2229 fi 2242 fi
2230} 2243}
2231 2244
2232# ================================================================================================ 2245# ================================================================================================
2233# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================ 2246# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================
2579 _python_check_python_pkg_setup_execution 2592 _python_check_python_pkg_setup_execution
2580 _python_initialize_prefix_variables 2593 _python_initialize_prefix_variables
2581 2594
2582 if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then 2595 if ! has "${EAPI:-0}" 0 1 2 || _python_package_supporting_installation_for_multiple_python_abis || _python_implementation || [[ "${CATEGORY}/${PN}" == "sys-apps/portage" ]]; then
2583 # PYTHON_ABI variable cannot be local in packages not supporting installation for multiple Python ABIs. 2596 # PYTHON_ABI variable cannot be local in packages not supporting installation for multiple Python ABIs.
2584 local allow_evaluated_non_sitedir_paths="0" dir dirs=() evaluated_dirs=() evaluated_files=() file files=() iterated_PYTHON_ABIS options=() other_dirs=() other_files=() previous_PYTHON_ABI="${PYTHON_ABI}" return_code root site_packages_dirs=() site_packages_files=() 2597 local allow_evaluated_non_sitedir_paths="0" dir dirs=() evaluated_dirs=() evaluated_files=() file files=() iterated_PYTHON_ABIS options=() other_dirs=() other_files=() previous_PYTHON_ABI="${PYTHON_ABI}" return_code root site_packages_dirs=() site_packages_files=() stderr stderr_line
2585 2598
2586 if _python_package_supporting_installation_for_multiple_python_abis; then 2599 if _python_package_supporting_installation_for_multiple_python_abis; then
2587 if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then 2600 if has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_ABIS}" ]]; then
2588 die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called" 2601 die "${FUNCNAME}(): python_pkg_setup() or python_execute_function() not called"
2589 fi 2602 fi
2684 options+=("-q") 2697 options+=("-q")
2685 2698
2686 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do 2699 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
2687 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then 2700 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then
2688 return_code="0" 2701 return_code="0"
2702 stderr=""
2689 ebegin "Compilation and optimization of Python modules for $(python_get_implementation) $(python_get_version)" 2703 ebegin "Compilation and optimization of Python modules for $(python_get_implementation) $(python_get_version)"
2690 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then 2704 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then
2691 for dir in "${site_packages_dirs[@]}"; do 2705 for dir in "${site_packages_dirs[@]}"; do
2692 dirs+=("${root}$(python_get_sitedir)/${dir}") 2706 dirs+=("${root}$(python_get_sitedir)/${dir}")
2693 done 2707 done
2694 for dir in "${evaluated_dirs[@]}"; do 2708 for dir in "${evaluated_dirs[@]}"; do
2695 eval "dirs+=(\"\${root}${dir}\")" 2709 eval "dirs+=(\"\${root}${dir}\")"
2696 done 2710 done
2697 "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" || return_code="1" 2711 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2698 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2712 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then
2699 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2713 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2700 fi 2714 fi
2701 _python_clean_compiled_modules "${dirs[@]}" 2715 _python_clean_compiled_modules "${dirs[@]}"
2702 fi 2716 fi
2705 files+=("${root}$(python_get_sitedir)/${file}") 2719 files+=("${root}$(python_get_sitedir)/${file}")
2706 done 2720 done
2707 for file in "${evaluated_files[@]}"; do 2721 for file in "${evaluated_files[@]}"; do
2708 eval "files+=(\"\${root}${file}\")" 2722 eval "files+=(\"\${root}${file}\")"
2709 done 2723 done
2710 "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" || return_code="1" 2724 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" 2>&1)" || return_code="1"
2711 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2725 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then
2712 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" &> /dev/null || return_code="1" 2726 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" &> /dev/null || return_code="1"
2713 fi 2727 fi
2714 _python_clean_compiled_modules "${files[@]}" 2728 _python_clean_compiled_modules "${files[@]}"
2715 fi 2729 fi
2716 eend "${return_code}" 2730 eend "${return_code}"
2731 if [[ -n "${stderr}" ]]; then
2732 eerror "Syntax errors / warnings in Python modules for $(python_get_implementation) $(python_get_version):" &> /dev/null
2733 while read stderr_line; do
2734 eerror " ${stderr_line}"
2735 done <<< "${stderr}"
2736 fi
2717 fi 2737 fi
2718 unset dirs files 2738 unset dirs files
2719 done 2739 done
2720 2740
2721 if _python_package_supporting_installation_for_multiple_python_abis; then 2741 if _python_package_supporting_installation_for_multiple_python_abis; then
2727 fi 2747 fi
2728 fi 2748 fi
2729 2749
2730 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 2750 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
2731 return_code="0" 2751 return_code="0"
2752 stderr=""
2732 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version)" 2753 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version)"
2733 if ((${#other_dirs[@]})); then 2754 if ((${#other_dirs[@]})); then
2734 "$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 2755 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2735 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2756 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then
2736 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2757 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2737 fi 2758 fi
2738 _python_clean_compiled_modules "${other_dirs[@]}" 2759 _python_clean_compiled_modules "${other_dirs[@]}"
2739 fi 2760 fi
2740 if ((${#other_files[@]})); then 2761 if ((${#other_files[@]})); then
2741 "$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 2762 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" 2>&1)" || return_code="1"
2742 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2763 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then
2743 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1" 2764 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1"
2744 fi 2765 fi
2745 _python_clean_compiled_modules "${other_files[@]}" 2766 _python_clean_compiled_modules "${other_files[@]}"
2746 fi 2767 fi
2747 eend "${return_code}" 2768 eend "${return_code}"
2769 if [[ -n "${stderr}" ]]; then
2770 eerror "Syntax errors / warnings in Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version):" &> /dev/null
2771 while read stderr_line; do
2772 eerror " ${stderr_line}"
2773 done <<< "${stderr}"
2774 fi
2748 fi 2775 fi
2749 else 2776 else
2750 # Deprecated part of python_mod_optimize() 2777 # Deprecated part of python_mod_optimize()
2751 ewarn 2778 ewarn
2752 ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation" 2779 ewarn "Deprecation Warning: Usage of ${FUNCNAME}() in packages not supporting installation"

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.121

  ViewVC Help
Powered by ViewVC 1.1.20