| 1 |
mgorny 13/03/04 19:22:13 |
| 2 |
|
| 3 |
Modified: ChangeLog multibuild.eclass python-r1.eclass |
| 4 |
Log: |
| 5 |
Move run_in_build_dir() to multibuild.eclass. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.706 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.706&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.706&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.705&r2=1.706 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.705 |
| 18 |
retrieving revision 1.706 |
| 19 |
diff -u -r1.705 -r1.706 |
| 20 |
--- ChangeLog 4 Mar 2013 19:21:27 -0000 1.705 |
| 21 |
+++ ChangeLog 4 Mar 2013 19:22:13 -0000 1.706 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.705 2013/03/04 19:21:27 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.706 2013/03/04 19:22:13 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 04 Mar 2013; Michał Górny <mgorny@g.o> multibuild.eclass, |
| 29 |
+ python-r1.eclass: |
| 30 |
+ Move run_in_build_dir() to multibuild.eclass. |
| 31 |
|
| 32 |
04 Mar 2013; Michał Górny <mgorny@g.o> +multibuild.eclass: |
| 33 |
Introduce multibuild.eclass to handle building multiple variants of the same |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 eclass/multibuild.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: multibuild.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- multibuild.eclass 4 Mar 2013 19:21:27 -0000 1.1 |
| 50 |
+++ multibuild.eclass 4 Mar 2013 19:22:13 -0000 1.2 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.1 2013/03/04 19:21:27 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.2 2013/03/04 19:22:13 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: multibuild |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -174,5 +174,24 @@ |
| 60 |
return ${ret} |
| 61 |
} |
| 62 |
|
| 63 |
+# @FUNCTION: run_in_build_dir |
| 64 |
+# @USAGE: <argv>... |
| 65 |
+# @DESCRIPTION: |
| 66 |
+# Run the given command in the directory pointed by BUILD_DIR. |
| 67 |
+run_in_build_dir() { |
| 68 |
+ debug-print-function ${FUNCNAME} "${@}" |
| 69 |
+ local ret |
| 70 |
+ |
| 71 |
+ [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified." |
| 72 |
+ [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set." |
| 73 |
+ |
| 74 |
+ pushd "${BUILD_DIR}" >/dev/null || die |
| 75 |
+ "${@}" |
| 76 |
+ ret=${?} |
| 77 |
+ popd >/dev/null || die |
| 78 |
+ |
| 79 |
+ return ${ret} |
| 80 |
+} |
| 81 |
+ |
| 82 |
_MULTIBUILD=1 |
| 83 |
fi |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.45 eclass/python-r1.eclass |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.45&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.45&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.44&r2=1.45 |
| 92 |
|
| 93 |
Index: python-r1.eclass |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v |
| 96 |
retrieving revision 1.44 |
| 97 |
retrieving revision 1.45 |
| 98 |
diff -u -r1.44 -r1.45 |
| 99 |
--- python-r1.eclass 27 Feb 2013 21:02:59 -0000 1.44 |
| 100 |
+++ python-r1.eclass 4 Mar 2013 19:22:13 -0000 1.45 |
| 101 |
@@ -1,6 +1,6 @@ |
| 102 |
# Copyright 1999-2013 Gentoo Foundation |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.44 2013/02/27 21:02:59 mgorny Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.45 2013/03/04 19:22:13 mgorny Exp $ |
| 106 |
|
| 107 |
# @ECLASS: python-r1 |
| 108 |
# @MAINTAINER: |
| 109 |
@@ -48,7 +48,7 @@ |
| 110 |
die 'python-r1.eclass can not be used with python-any-r1.eclass.' |
| 111 |
fi |
| 112 |
|
| 113 |
-inherit python-utils-r1 |
| 114 |
+inherit multibuild python-utils-r1 |
| 115 |
|
| 116 |
# @ECLASS-VARIABLE: PYTHON_COMPAT |
| 117 |
# @REQUIRED |
| 118 |
@@ -690,24 +690,5 @@ |
| 119 |
done |
| 120 |
} |
| 121 |
|
| 122 |
-# @FUNCTION: run_in_build_dir |
| 123 |
-# @USAGE: <argv>... |
| 124 |
-# @DESCRIPTION: |
| 125 |
-# Run the given command in the directory pointed by BUILD_DIR. |
| 126 |
-run_in_build_dir() { |
| 127 |
- debug-print-function ${FUNCNAME} "${@}" |
| 128 |
- local ret |
| 129 |
- |
| 130 |
- [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified." |
| 131 |
- [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set." |
| 132 |
- |
| 133 |
- pushd "${BUILD_DIR}" >/dev/null || die |
| 134 |
- "${@}" |
| 135 |
- ret=${?} |
| 136 |
- popd >/dev/null || die |
| 137 |
- |
| 138 |
- return ${ret} |
| 139 |
-} |
| 140 |
- |
| 141 |
_PYTHON_R1=1 |
| 142 |
fi |
Archives