[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass

[Michal Gorny (mgorny)]

mgorny      12/10/29 13:30:48

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Introduce an esetup.py wrapper function and mydistutilsargs=() for it.

Revision  Changes    Path
1.483                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.483&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.483&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.482&r2=1.483

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- ChangeLog	29 Oct 2012 11:27:30 -0000	1.482
+++ ChangeLog	29 Oct 2012 13:30:48 -0000	1.483
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.482 2012/10/29 11:27:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.483 2012/10/29 13:30:48 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass:
+  Introduce an esetup.py wrapper function and mydistutilsargs=() for it.
 
   29 Oct 2012; Michał Górny <mgorny@g.o> python-r1.eclass:
   Enable python3.3 support.



1.13                 eclass/distutils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.12&r2=1.13

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- distutils-r1.eclass	29 Oct 2012 09:54:50 -0000	1.12
+++ distutils-r1.eclass	29 Oct 2012 13:30:48 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.12 2012/10/29 09:54:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.13 2012/10/29 13:30:48 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -105,6 +105,37 @@
 # HTML_DOCS=( doc/html/ )
 # @CODE
 
+# @ECLASS-VARIABLE: mydistutilsargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing options to be passed to setup.py.
+#
+# Example:
+# @CODE
+# python_configure_all() {
+# 	mydistutilsargs=( --enable-my-hidden-option )
+# }
+# @CODE
+
+# @FUNCTION: esetup.py
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Run the setup.py using currently selected Python interpreter
+# (if ${PYTHON} is set; fallback 'python' otherwise). The setup.py will
+# be passed default command-line arguments, then ${mydistutilsargs[@]},
+# then any parameters passed to this command.
+#
+# This command dies on failure.
+esetup.py() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	set -- "${PYTHON:-python}" setup.py \
+		"${mydistutilsargs[@]}" "${@}"
+
+	echo "${@}" >&2
+	"${@}" || die
+}
+
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES
@@ -147,15 +178,12 @@
 # @FUNCTION: distutils-r1_python_compile
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
-# The default python_compile(). Runs 'setup.py build' using the correct
-# Python implementation. Any parameters passed to this function will be
-# passed to setup.py.
+# The default python_compile(). Runs 'esetup.py build'. Any parameters
+# passed to this function will be passed to setup.py.
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	set -- "${PYTHON}" setup.py build "${@}"
-	echo "${@}"
-	"${@}" || die
+	esetup.py build "${@}"
 }
 
 # @FUNCTION: distutils-r1_python_test
@@ -197,10 +225,9 @@
 # @FUNCTION: distutils-r1_python_install
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
-# The default python_install(). Runs 'setup.py install' using
-# the correct Python implementation, and appending the optimization
-# flags. Then calls distutils-r1_rename_scripts. Any parameters passed
-# to this function will be passed to setup.py.
+# The default python_install(). Runs 'esetup.py install', appending
+# the optimization flags. Then calls distutils-r1_rename_scripts.
+# Any parameters passed to this function will be passed to setup.py.
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -216,9 +243,7 @@
 
 	unset PYTHONDONTWRITEBYTECODE
 
-	set -- "${PYTHON}" setup.py install "${flags[@]}" --root="${D}" "${@}"
-	echo "${@}"
-	"${@}" || die
+	esetup.py install "${flags[@]}" --root="${D}" "${@}"
 
 	distutils-r1_rename_scripts
 }