From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass
Date: Sat, 8 Feb 2014 01:42:44 +0000 (UTC) [thread overview]
Message-ID: <20140208014244.B21FF2004C@flycatcher.gentoo.org> (raw)
vapier 14/02/08 01:42:44
Modified: cmake-utils.eclass
Log:
fix broken whitespace -- no functional changes
Revision Changes Path
1.103 eclass/cmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.102&r2=1.103
Index: cmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- cmake-utils.eclass 25 Jan 2014 04:07:04 -0000 1.102
+++ cmake-utils.eclass 8 Feb 2014 01:42:44 -0000 1.103
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.102 2014/01/25 04:07:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.103 2014/02/08 01:42:44 vapier Exp $
# @ECLASS: cmake-utils.eclass
# @MAINTAINER:
@@ -372,16 +372,15 @@
enable_cmake-utils_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
- debug-print "$FUNCNAME: PATCHES=$PATCHES"
+ debug-print "$FUNCNAME: PATCHES=$PATCHES"
- pushd "${S}" > /dev/null
- [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
- debug-print "$FUNCNAME: applying user patches"
- epatch_user
+ pushd "${S}" >/dev/null
+ [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
- popd > /dev/null
+ debug-print "$FUNCNAME: applying user patches"
+ epatch_user
+ popd >/dev/null
}
# @VARIABLE: mycmakeargs
@@ -509,11 +508,11 @@
"${MYCMAKEARGS}"
)
- pushd "${BUILD_DIR}" > /dev/null
+ pushd "${BUILD_DIR}" >/dev/null
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
- popd > /dev/null
+ popd >/dev/null
}
enable_cmake-utils_src_compile() {
@@ -591,37 +590,37 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${BUILD_DIR}" > /dev/null
+ pushd "${BUILD_DIR}" >/dev/null
${CMAKE_MAKEFILE_GENERATOR}_src_make $@
- popd > /dev/null
+ popd >/dev/null
}
enable_cmake-utils_src_install() {
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${BUILD_DIR}" > /dev/null
+ pushd "${BUILD_DIR}" >/dev/null
DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
- popd > /dev/null
+ popd >/dev/null
- pushd "${S}" > /dev/null
- #Install docs, copied from base_src_install_docs
+ pushd "${S}" >/dev/null
+ # Install docs, copied from base_src_install_docs
local x
- if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
- for x in "${DOCS[@]}"; do
- debug-print "$FUNCNAME: docs: creating document from ${x}"
- dodoc "${x}" || die "dodoc failed"
- done
- fi
- if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
- for x in "${HTML_DOCS[@]}"; do
- debug-print "$FUNCNAME: docs: creating html document from ${x}"
- dohtml -r "${x}" || die "dohtml failed"
- done
- fi
+ if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
+ for x in "${DOCS[@]}"; do
+ debug-print "$FUNCNAME: docs: creating document from ${x}"
+ dodoc "${x}" || die "dodoc failed"
+ done
+ fi
+ if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
+ for x in "${HTML_DOCS[@]}"; do
+ debug-print "$FUNCNAME: docs: creating html document from ${x}"
+ dohtml -r "${x}" || die "dohtml failed"
+ done
+ fi
# Backward compatibility, for non-array variables
if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
@@ -631,21 +630,21 @@
dohtml -r ${HTML_DOCS} || die "dohtml failed"
fi
- popd > /dev/null
+ popd >/dev/null
}
enable_cmake-utils_src_test() {
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${BUILD_DIR}" > /dev/null
+ pushd "${BUILD_DIR}" >/dev/null
[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
if ctest "${myctestargs[@]}" "$@" ; then
einfo "Tests succeeded."
- popd > /dev/null
+ popd >/dev/null
return 0
else
if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
@@ -660,7 +659,7 @@
fi
# die might not die due to nonfatal
- popd > /dev/null
+ popd >/dev/null
return 1
fi
}
next reply other threads:[~2014-02-08 1:42 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-08 1:42 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-01 23:30 [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass Chris Reffett (creffett)
2013-06-14 21:13 Chris Reffett (creffett)
2013-06-13 21:16 Chris Reffett (creffett)
2013-01-17 20:18 Chris Reffett (creffett)
2012-12-03 10:33 Michal Gorny (mgorny)
2011-10-06 13:33 Michael Haubenwallner (haubi)
2011-08-27 20:30 Andreas HAttel (dilfridge)
2011-08-21 21:19 Andreas HAttel (dilfridge)
2011-08-20 21:43 Andreas HAttel (dilfridge)
2011-07-18 9:08 Andreas HAttel (dilfridge)
2011-06-27 21:11 Jonathan Callen (abcd)
2011-04-27 16:54 Tomas Chvatal (scarabeus)
2011-03-18 19:45 Tomas Chvatal (scarabeus)
2011-01-26 20:51 Tomas Chvatal (scarabeus)
2011-01-20 0:48 Maciej Mrozowski (reavertm)
2011-01-19 12:44 Tomas Chvatal (scarabeus)
2011-01-13 19:17 Fabian Groffen (grobian)
2010-12-30 14:23 Theo Chatzimichos (tampakrap)
2010-12-16 14:36 Tomas Chvatal (scarabeus)
2010-10-13 16:40 Tomas Chvatal (scarabeus)
2010-09-16 16:04 Maciej Mrozowski (reavertm)
2010-08-13 5:02 Maciej Mrozowski (reavertm)
2010-08-12 19:27 Maciej Mrozowski (reavertm)
2010-07-14 15:48 Tomas Chvatal (scarabeus)
2010-07-09 16:31 Maciej Mrozowski (reavertm)
2010-06-26 17:55 Maciej Mrozowski (reavertm)
2010-06-21 16:39 Maciej Mrozowski (reavertm)
2010-05-27 2:44 Maciej Mrozowski (reavertm)
2010-04-30 23:58 Jonathan Callen (abcd)
2010-04-30 23:41 Jonathan Callen (abcd)
2010-04-10 2:20 Maciej Mrozowski (reavertm)
2010-03-24 21:09 Robin H. Johnson (robbat2)
2010-02-11 18:00 Samuli Suominen (ssuominen)
2010-02-11 17:41 Denis Dupeyron (calchan)
2010-01-20 2:55 Jonathan Callen (abcd)
2010-01-20 2:54 Jonathan Callen (abcd)
2010-01-11 17:02 Tomas Chvatal (scarabeus)
2010-01-10 22:17 Tomas Chvatal (scarabeus)
2009-12-23 0:32 Jonathan Callen (abcd)
2009-12-22 22:52 Tomas Chvatal (scarabeus)
2009-12-18 10:49 Zac Medico (zmedico)
2009-12-10 19:58 Jonathan Callen (abcd)
2009-10-27 21:20 Michael Sterrett (mr_bones_)
2009-10-27 14:30 Tomas Chvatal (scarabeus)
2009-10-16 12:24 Samuli Suominen (ssuominen)
2009-08-08 20:08 Arfrever Frehtes Taifersar Arahesis (arfrever)
2009-06-17 22:39 Tomas Chvatal (scarabeus)
2009-05-29 8:06 Tomas Chvatal (scarabeus)
2009-05-27 14:34 Tomas Chvatal (scarabeus)
2009-05-08 10:54 Tomas Chvatal (scarabeus)
2009-04-11 19:44 Tomas Chvatal (scarabeus)
2009-04-10 20:24 Tomas Chvatal (scarabeus)
2009-04-04 12:28 Tomas Chvatal (scarabeus)
2009-03-19 9:12 Tomas Chvatal (scarabeus)
2009-03-15 16:54 Tomas Chvatal (scarabeus)
2009-03-14 11:14 Tomas Chvatal (scarabeus)
2009-03-12 8:45 Christian Faulhammer (fauli)
2009-03-11 16:22 Tomas Chvatal (scarabeus)
2009-03-10 23:22 Tomas Chvatal (scarabeus)
2008-12-24 15:41 Tomas Chvatal (scarabeus)
2008-11-05 20:59 Tomas Chvatal (scarabeus)
2008-10-28 17:39 Tomas Chvatal (scarabeus)
2008-10-27 14:38 Mike Frysinger (vapier)
2008-10-27 5:36 Mike Frysinger (vapier)
2008-09-28 18:52 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2008-09-28 16:19 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2008-04-23 11:55 Ingmar Vanhassel (ingmar)
2008-03-29 21:33 Wulf Krueger (philantrop)
2008-02-20 14:33 Bo Oersted Andresen (zlin)
2008-02-20 0:35 Bo Oersted Andresen (zlin)
2007-12-13 16:23 Petteri Raty (betelgeuse)
2007-12-06 20:40 Wulf Krueger (philantrop)
2007-11-11 20:02 Wulf Krueger (philantrop)
2007-11-04 13:17 Wulf Krueger (philantrop)
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=20140208014244.B21FF2004C@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.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