| 1 |
mgorny 12/12/01 10:53:40 |
| 2 |
|
| 3 |
Modified: ChangeLog distutils-r1.eclass |
| 4 |
Log: |
| 5 |
Create the wrapper symlinks directly in _distutils-r1_rename_scripts rather than postponing it to distutils-r1_install_all. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.536 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.536&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.536&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.535&r2=1.536 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.535 |
| 18 |
retrieving revision 1.536 |
| 19 |
diff -u -r1.535 -r1.536 |
| 20 |
--- ChangeLog 1 Dec 2012 10:52:40 -0000 1.535 |
| 21 |
+++ ChangeLog 1 Dec 2012 10:53:40 -0000 1.536 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.536 2012/12/01 10:53:40 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 01 Dec 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 29 |
+ Create the wrapper symlinks directly in _distutils-r1_rename_scripts rather |
| 30 |
+ than postponing it to distutils-r1_install_all. |
| 31 |
|
| 32 |
01 Dec 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 33 |
Use intermediate-root install. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.23 eclass/distutils-r1.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.23&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.23&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.22&r2=1.23 |
| 42 |
|
| 43 |
Index: distutils-r1.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
| 46 |
retrieving revision 1.22 |
| 47 |
retrieving revision 1.23 |
| 48 |
diff -u -r1.22 -r1.23 |
| 49 |
--- distutils-r1.eclass 1 Dec 2012 10:52:40 -0000 1.22 |
| 50 |
+++ distutils-r1.eclass 1 Dec 2012 10:53:40 -0000 1.23 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.23 2012/12/01 10:53:40 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: distutils-r1 |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -268,8 +268,11 @@ |
| 60 |
debug-print "${FUNCNAME}: matching shebang: $(head -n 1 "${f}")" |
| 61 |
|
| 62 |
local newf=${f}-${EPYTHON} |
| 63 |
- debug-print "${FUNCNAME}: renamed to ${newf#${D}/}" |
| 64 |
+ debug-print "${FUNCNAME}: renaming to ${newf#${D}/}" |
| 65 |
mv "${f}" "${newf}" || die |
| 66 |
+ |
| 67 |
+ debug-print "${FUNCNAME}: installing wrapper at ${f#${D}/}" |
| 68 |
+ _python_ln_rel "${path}"/usr/bin/python-exec "${f}" || die |
| 69 |
fi |
| 70 |
done < <(find "${path}" -type f -executable -print0) |
| 71 |
} |
| 72 |
@@ -309,9 +312,7 @@ |
| 73 |
|
| 74 |
# @FUNCTION: distutils-r1_python_install_all |
| 75 |
# @DESCRIPTION: |
| 76 |
-# The default python_install_all(). It symlinks wrappers |
| 77 |
-# for the implementation-suffixed executables and installs |
| 78 |
-# documentation. |
| 79 |
+# The default python_install_all(). It installs the documentation. |
| 80 |
distutils-r1_python_install_all() { |
| 81 |
debug-print-function ${FUNCNAME} "${@}" |
| 82 |
|
| 83 |
@@ -331,20 +332,6 @@ |
| 84 |
if declare -p HTML_DOCS &>/dev/null; then |
| 85 |
dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" |
| 86 |
fi |
| 87 |
- |
| 88 |
- # note: keep in sync with ...rename_scripts() |
| 89 |
- # also, we assume that each script is installed for all impls |
| 90 |
- local EPYTHON |
| 91 |
- python_export_best EPYTHON |
| 92 |
- |
| 93 |
- local f |
| 94 |
- while IFS= read -r -d '' f; do |
| 95 |
- debug-print "${FUNCNAME}: found executable at ${f#${D}/}" |
| 96 |
- |
| 97 |
- local wrapf=${f%-${EPYTHON}} |
| 98 |
- |
| 99 |
- _python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die |
| 100 |
- done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0) |
| 101 |
} |
| 102 |
|
| 103 |
# @FUNCTION: distutils-r1_run_phase |
Archives