diff options
author | 2013-02-26 20:51:32 +0100 | |
---|---|---|
committer | 2013-02-26 20:51:32 +0100 | |
commit | 834537df27233b1a8b590778df147cb02832a5e9 (patch) | |
tree | 43a4fbf81ad0e2c114b7e75371f1573fb620543a /eclass | |
parent | Enable commit signing. (diff) | |
download | emacs-834537df27233b1a8b590778df147cb02832a5e9.tar.gz emacs-834537df27233b1a8b590778df147cb02832a5e9.tar.bz2 emacs-834537df27233b1a8b590778df147cb02832a5e9.zip |
elisp-common.eclass: Some functions now die on failure.
* elisp-common.eclass (elisp-compile, elisp-make-autoload-file)
(elisp-install, elisp-site-file-install): Die on failure.
* elisp.eclass (elisp_src_compile, elisp_src_install): Remove die
commands that are no longer necessary because the called functions
die themselves.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 8 | ||||
-rw-r--r-- | eclass/elisp-common.eclass | 17 | ||||
-rw-r--r-- | eclass/elisp.eclass | 8 |
3 files changed, 21 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c24ca06..66d6064 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,3 +1,11 @@ +2013-02-26 Ulrich Müller <ulm@gentoo.org> + + * elisp-common.eclass (elisp-compile, elisp-make-autoload-file) + (elisp-install, elisp-site-file-install): Die on failure. + * elisp.eclass (elisp_src_compile, elisp_src_install): Remove die + commands that are no longer necessary because the called functions + die themselves. + 2012-12-12 Ulrich Müller <ulm@gentoo.org> * elisp-common.eclass (elisp-need-emacs): Return 2 as exit status diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 666b5b3..dcba57b 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @@ -50,7 +50,7 @@ # directory is added to the load-path which makes sure that all files # are loadable. # -# elisp-compile *.el || die +# elisp-compile *.el # # Function elisp-make-autoload-file() can be used to generate a file # with autoload definitions for the lisp functions. It takes the output @@ -70,7 +70,7 @@ # choose something else, but remember to tell elisp-site-file-install() # (see below) the change, as it defaults to ${PN}. # -# elisp-install ${PN} *.el *.elc || die +# elisp-install ${PN} *.el *.elc # # To let the Emacs support be activated by Emacs on startup, you need # to provide a site file (shipped in ${FILESDIR}) which contains the @@ -112,7 +112,7 @@ # # Which is then installed by # -# elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die +# elisp-site-file-install "${FILESDIR}/${SITEFILE}" # # in src_install(). Any characters after the "-gentoo" part and before # the extension will be stripped from the destination file's name. @@ -168,6 +168,7 @@ EMACSFLAGS="-batch -q --no-site-file" BYTECOMPFLAGS="-L ." # @FUNCTION: elisp-emacs-version +# @RETURN: exit status of Emacs # @DESCRIPTION: # Output version of currently active Emacs. @@ -223,7 +224,7 @@ elisp-need-emacs() { elisp-compile() { ebegin "Compiling GNU Emacs Elisp files" ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" - eend $? "elisp-compile: batch-byte-compile failed" + eend $? "elisp-compile: batch-byte-compile failed" || die } # @FUNCTION: elisp-make-autoload-file @@ -259,7 +260,7 @@ elisp-make-autoload-file() { --eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \ -f batch-update-autoloads "${@-.}" - eend $? "elisp-make-autoload-file: batch-update-autoloads failed" + eend $? "elisp-make-autoload-file: batch-update-autoloads failed" || die } # @FUNCTION: elisp-install @@ -275,7 +276,7 @@ elisp-install() { insinto "${SITELISP}/${subdir}" doins "$@" ) - eend $? "elisp-install: doins failed" + eend $? "elisp-install: doins failed" || die } # @FUNCTION: elisp-site-file-install @@ -305,7 +306,7 @@ elisp-site-file-install() { ) ret=$? rm -f "${sf}" - eend ${ret} "elisp-site-file-install: doins failed" + eend ${ret} "elisp-site-file-install: doins failed" || die } # @FUNCTION: elisp-site-regen diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 22f7ffe..3cf1d5f 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @@ -151,7 +151,7 @@ elisp_src_configure() { :; } # GNU Info files from them. elisp_src_compile() { - elisp-compile *.el || die + elisp-compile *.el if [[ -n ${ELISP_TEXINFO} ]]; then makeinfo ${ELISP_TEXINFO} || die fi @@ -165,9 +165,9 @@ elisp_src_compile() { # ELISP_TEXINFO and documentation listed in the DOCS variable. elisp_src_install() { - elisp-install ${PN} *.el *.elc || die + elisp-install ${PN} *.el *.elc if [[ -n ${SITEFILE} ]]; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi if [[ -n ${ELISP_TEXINFO} ]]; then set -- ${ELISP_TEXINFO} |