| 1 |
vapier 14/02/08 01:42:44 |
| 2 |
|
| 3 |
Modified: cmake-utils.eclass |
| 4 |
Log: |
| 5 |
fix broken whitespace -- no functional changes |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.103 eclass/cmake-utils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.103&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.103&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.102&r2=1.103 |
| 13 |
|
| 14 |
Index: cmake-utils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v |
| 17 |
retrieving revision 1.102 |
| 18 |
retrieving revision 1.103 |
| 19 |
diff -u -r1.102 -r1.103 |
| 20 |
--- cmake-utils.eclass 25 Jan 2014 04:07:04 -0000 1.102 |
| 21 |
+++ cmake-utils.eclass 8 Feb 2014 01:42:44 -0000 1.103 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2014 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.102 2014/01/25 04:07:04 floppym Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.103 2014/02/08 01:42:44 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: cmake-utils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -372,16 +372,15 @@ |
| 31 |
enable_cmake-utils_src_prepare() { |
| 32 |
debug-print-function ${FUNCNAME} "$@" |
| 33 |
|
| 34 |
- debug-print "$FUNCNAME: PATCHES=$PATCHES" |
| 35 |
+ debug-print "$FUNCNAME: PATCHES=$PATCHES" |
| 36 |
|
| 37 |
- pushd "${S}" > /dev/null |
| 38 |
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 39 |
- |
| 40 |
- debug-print "$FUNCNAME: applying user patches" |
| 41 |
- epatch_user |
| 42 |
+ pushd "${S}" >/dev/null |
| 43 |
+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" |
| 44 |
|
| 45 |
- popd > /dev/null |
| 46 |
+ debug-print "$FUNCNAME: applying user patches" |
| 47 |
+ epatch_user |
| 48 |
|
| 49 |
+ popd >/dev/null |
| 50 |
} |
| 51 |
|
| 52 |
# @VARIABLE: mycmakeargs |
| 53 |
@@ -509,11 +508,11 @@ |
| 54 |
"${MYCMAKEARGS}" |
| 55 |
) |
| 56 |
|
| 57 |
- pushd "${BUILD_DIR}" > /dev/null |
| 58 |
+ pushd "${BUILD_DIR}" >/dev/null |
| 59 |
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}" |
| 60 |
echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" |
| 61 |
"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed" |
| 62 |
- popd > /dev/null |
| 63 |
+ popd >/dev/null |
| 64 |
} |
| 65 |
|
| 66 |
enable_cmake-utils_src_compile() { |
| 67 |
@@ -591,37 +590,37 @@ |
| 68 |
debug-print-function ${FUNCNAME} "$@" |
| 69 |
|
| 70 |
_check_build_dir |
| 71 |
- pushd "${BUILD_DIR}" > /dev/null |
| 72 |
+ pushd "${BUILD_DIR}" >/dev/null |
| 73 |
|
| 74 |
${CMAKE_MAKEFILE_GENERATOR}_src_make $@ |
| 75 |
|
| 76 |
- popd > /dev/null |
| 77 |
+ popd >/dev/null |
| 78 |
} |
| 79 |
|
| 80 |
enable_cmake-utils_src_install() { |
| 81 |
debug-print-function ${FUNCNAME} "$@" |
| 82 |
|
| 83 |
_check_build_dir |
| 84 |
- pushd "${BUILD_DIR}" > /dev/null |
| 85 |
+ pushd "${BUILD_DIR}" >/dev/null |
| 86 |
DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install" |
| 87 |
- popd > /dev/null |
| 88 |
+ popd >/dev/null |
| 89 |
|
| 90 |
- pushd "${S}" > /dev/null |
| 91 |
- #Install docs, copied from base_src_install_docs |
| 92 |
+ pushd "${S}" >/dev/null |
| 93 |
+ # Install docs, copied from base_src_install_docs |
| 94 |
local x |
| 95 |
|
| 96 |
- if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then |
| 97 |
- for x in "${DOCS[@]}"; do |
| 98 |
- debug-print "$FUNCNAME: docs: creating document from ${x}" |
| 99 |
- dodoc "${x}" || die "dodoc failed" |
| 100 |
- done |
| 101 |
- fi |
| 102 |
- if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then |
| 103 |
- for x in "${HTML_DOCS[@]}"; do |
| 104 |
- debug-print "$FUNCNAME: docs: creating html document from ${x}" |
| 105 |
- dohtml -r "${x}" || die "dohtml failed" |
| 106 |
- done |
| 107 |
- fi |
| 108 |
+ if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then |
| 109 |
+ for x in "${DOCS[@]}"; do |
| 110 |
+ debug-print "$FUNCNAME: docs: creating document from ${x}" |
| 111 |
+ dodoc "${x}" || die "dodoc failed" |
| 112 |
+ done |
| 113 |
+ fi |
| 114 |
+ if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then |
| 115 |
+ for x in "${HTML_DOCS[@]}"; do |
| 116 |
+ debug-print "$FUNCNAME: docs: creating html document from ${x}" |
| 117 |
+ dohtml -r "${x}" || die "dohtml failed" |
| 118 |
+ done |
| 119 |
+ fi |
| 120 |
|
| 121 |
# Backward compatibility, for non-array variables |
| 122 |
if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then |
| 123 |
@@ -631,21 +630,21 @@ |
| 124 |
dohtml -r ${HTML_DOCS} || die "dohtml failed" |
| 125 |
fi |
| 126 |
|
| 127 |
- popd > /dev/null |
| 128 |
+ popd >/dev/null |
| 129 |
} |
| 130 |
|
| 131 |
enable_cmake-utils_src_test() { |
| 132 |
debug-print-function ${FUNCNAME} "$@" |
| 133 |
|
| 134 |
_check_build_dir |
| 135 |
- pushd "${BUILD_DIR}" > /dev/null |
| 136 |
+ pushd "${BUILD_DIR}" >/dev/null |
| 137 |
[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } |
| 138 |
|
| 139 |
[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) |
| 140 |
|
| 141 |
if ctest "${myctestargs[@]}" "$@" ; then |
| 142 |
einfo "Tests succeeded." |
| 143 |
- popd > /dev/null |
| 144 |
+ popd >/dev/null |
| 145 |
return 0 |
| 146 |
else |
| 147 |
if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then |
| 148 |
@@ -660,7 +659,7 @@ |
| 149 |
fi |
| 150 |
|
| 151 |
# die might not die due to nonfatal |
| 152 |
- popd > /dev/null |
| 153 |
+ popd >/dev/null |
| 154 |
return 1 |
| 155 |
fi |
| 156 |
} |
Archives