public inbox for gentoo-python@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-python@lists.gentoo.org
Cc: python@gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-python] [PATCH distutils-r1 5/6] Install the wrapper symlink in _distutils-r1_rename_scripts.
Date: Thu, 29 Nov 2012 12:31:33 +0100	[thread overview]
Message-ID: <1354188694-7229-6-git-send-email-mgorny@gentoo.org> (raw)
In-Reply-To: <1354188694-7229-1-git-send-email-mgorny@gentoo.org>

This is cleaner than delaying it to install_all().
---
 gx86/eclass/distutils-r1.eclass | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index fffa800..c21ab30 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -268,8 +268,11 @@ _distutils-r1_rename_scripts() {
 			debug-print "${FUNCNAME}: matching shebang: $(head -n 1 "${f}")"
 
 			local newf=${f}-${EPYTHON}
-			debug-print "${FUNCNAME}: renamed to ${newf#${D}/}"
+			debug-print "${FUNCNAME}: renaming to ${newf#${D}/}"
 			mv "${f}" "${newf}" || die
+
+			debug-print "${FUNCNAME}: installing wrapper at ${f#${D}/}"
+			_python_ln_rel "${path}"/usr/bin/python-exec "${f}" || die
 		fi
 	done < <(find "${path}" -type f -executable -print0)
 }
@@ -309,9 +312,7 @@ distutils-r1_python_install() {
 
 # @FUNCTION: distutils-r1_python_install_all
 # @DESCRIPTION:
-# The default python_install_all(). It symlinks wrappers
-# for the implementation-suffixed executables and installs
-# documentation.
+# The default python_install_all(). It installs the documentation.
 distutils-r1_python_install_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -331,20 +332,6 @@ distutils-r1_python_install_all() {
 	if declare -p HTML_DOCS &>/dev/null; then
 		dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
 	fi
-
-	# note: keep in sync with ...rename_scripts()
-	# also, we assume that each script is installed for all impls
-	local EPYTHON
-	python_export_best EPYTHON
-
-	local f
-	while IFS= read -r -d '' f; do
-		debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
-
-		local wrapf=${f%-${EPYTHON}}
-
-		_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
-	done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0)
 }
 
 # @FUNCTION: distutils-r1_run_phase
-- 
1.8.0



  parent reply	other threads:[~2012-11-29 11:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-29 11:31 [gentoo-python] distutils-r1: a bit of clean up + parallel builds Michał Górny
2012-11-29 11:31 ` [gentoo-python] [PATCH distutils-r1 1/6] Make distutils-r1_rename_scripts private Michał Górny
2012-11-29 11:31 ` [gentoo-python] [PATCH distutils-r1 2/6] Rename all Python executables in distutils-r1_rename_scripts Michał Górny
2012-11-29 11:31 ` [gentoo-python] [PATCH distutils-r1 3/6] _distutils-r1_rename_scripts: require explicit path Michał Górny
2012-11-29 11:31 ` [gentoo-python] [PATCH distutils-r1 4/6] Install files to intermediate root and merge afterwards Michał Górny
2012-11-29 11:31 ` Michał Górny [this message]
2012-11-29 11:31 ` [gentoo-python] [PATCH distutils-r1 6/6] Run sub-phases in parallel Michał Górny
2012-11-29 16:29 ` [gentoo-python] Re: distutils-r1: a bit of clean up + parallel builds Mike Gilbert
2012-11-29 16:40   ` Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354188694-7229-6-git-send-email-mgorny@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-python@lists.gentoo.org \
    --cc=python@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox