libmakepkg: move package checking out of tidy_install
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
68602f4931
commit
bfe9b56e1f
|
@ -41,6 +41,7 @@ LIBRARY = \
|
||||||
libmakepkgdir = $(datarootdir)/makepkg
|
libmakepkgdir = $(datarootdir)/makepkg
|
||||||
|
|
||||||
LIBMAKEPKGDIRS = \
|
LIBMAKEPKGDIRS = \
|
||||||
|
lint_package \
|
||||||
tidy \
|
tidy \
|
||||||
util
|
util
|
||||||
|
|
||||||
|
@ -49,12 +50,13 @@ LIBMAKEPKG = \
|
||||||
libmakepkg/util/option.sh
|
libmakepkg/util/option.sh
|
||||||
|
|
||||||
LIBMAKEPKG_IN = \
|
LIBMAKEPKG_IN = \
|
||||||
|
libmakepkg/lint_package.sh \
|
||||||
|
libmakepkg/lint_package/build_references.sh \
|
||||||
|
libmakepkg/lint_package/missing_backup.sh \
|
||||||
libmakepkg/tidy.sh \
|
libmakepkg/tidy.sh \
|
||||||
libmakepkg/tidy/build_references.sh \
|
|
||||||
libmakepkg/tidy/docs.sh \
|
libmakepkg/tidy/docs.sh \
|
||||||
libmakepkg/tidy/emptydirs.sh \
|
libmakepkg/tidy/emptydirs.sh \
|
||||||
libmakepkg/tidy/libtool.sh \
|
libmakepkg/tidy/libtool.sh \
|
||||||
libmakepkg/tidy/missing_backup.sh \
|
|
||||||
libmakepkg/tidy/optipng.sh \
|
libmakepkg/tidy/optipng.sh \
|
||||||
libmakepkg/tidy/purge.sh \
|
libmakepkg/tidy/purge.sh \
|
||||||
libmakepkg/tidy/staticlibs.sh \
|
libmakepkg/tidy/staticlibs.sh \
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
|
lint_package.sh
|
||||||
|
lint_package/build_references.sh
|
||||||
|
lint_package/missing_backup.sh
|
||||||
tidy.sh
|
tidy.sh
|
||||||
tidy/build_references.sh
|
|
||||||
tidy/docs.sh
|
tidy/docs.sh
|
||||||
tidy/emptydirs.sh
|
tidy/emptydirs.sh
|
||||||
tidy/libtool.sh
|
tidy/libtool.sh
|
||||||
tidy/missing_backup.sh
|
|
||||||
tidy/optipng.sh
|
tidy/optipng.sh
|
||||||
tidy/purge.sh
|
tidy/purge.sh
|
||||||
tidy/staticlibs.sh
|
tidy/staticlibs.sh
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# lint_package.sh - functions for checking for packaging errors
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015 Pacman Development Team <pacman-dev@archlinux.org>
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
[ -n "$LIBMAKEPKG_LINT_PACKAGE_SH" ] && return
|
||||||
|
LIBMAKEPKG_LINT_PACKAGE_SH=1
|
||||||
|
|
||||||
|
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
||||||
|
|
||||||
|
source "$LIBRARY/util/message.sh"
|
||||||
|
|
||||||
|
for lib in "$LIBRARY/lint_package/"*.sh; do
|
||||||
|
source "$lib"
|
||||||
|
done
|
||||||
|
|
||||||
|
lint_package() {
|
||||||
|
cd_safe "$pkgdir"
|
||||||
|
msg "$(gettext "Checking for packaging issue...")"
|
||||||
|
|
||||||
|
warn_missing_backup
|
||||||
|
warn_build_references
|
||||||
|
}
|
|
@ -18,8 +18,8 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
[ -n "$LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH" ] && return
|
[ -n "$LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH" ] && return
|
||||||
LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH=1
|
LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH=1
|
||||||
|
|
||||||
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
[ -n "$LIBMAKEPKG_TIDY_MISSING_BACKUP_SH" ] && return
|
[ -n "$LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH" ] && return
|
||||||
LIBMAKEPKG_TIDY_MISSING_BACKUP_SH=1
|
LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH=1
|
||||||
|
|
||||||
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
||||||
|
|
|
@ -47,11 +47,6 @@ tidy_install() {
|
||||||
tidy_staticlibs
|
tidy_staticlibs
|
||||||
tidy_emptydirs
|
tidy_emptydirs
|
||||||
|
|
||||||
# warn about packaging issues
|
|
||||||
# TODO: move these to another module
|
|
||||||
warn_missing_backup
|
|
||||||
warn_build_references
|
|
||||||
|
|
||||||
# options that reduce file sizes
|
# options that reduce file sizes
|
||||||
tidy_zipman
|
tidy_zipman
|
||||||
tidy_strip
|
tidy_strip
|
||||||
|
|
|
@ -2891,6 +2891,7 @@ run_split_packaging() {
|
||||||
backup_package_variables
|
backup_package_variables
|
||||||
run_package $pkgname
|
run_package $pkgname
|
||||||
tidy_install
|
tidy_install
|
||||||
|
lint_package
|
||||||
create_package
|
create_package
|
||||||
create_debug_package
|
create_debug_package
|
||||||
restore_package_variables
|
restore_package_variables
|
||||||
|
@ -3348,6 +3349,7 @@ if (( INFAKEROOT )); then
|
||||||
run_package
|
run_package
|
||||||
fi
|
fi
|
||||||
tidy_install
|
tidy_install
|
||||||
|
lint_package
|
||||||
create_package
|
create_package
|
||||||
create_debug_package
|
create_debug_package
|
||||||
else
|
else
|
||||||
|
|
|
@ -8,11 +8,13 @@ scripts/pacman-key.sh.in
|
||||||
scripts/pacman-optimize.sh.in
|
scripts/pacman-optimize.sh.in
|
||||||
scripts/pkgdelta.sh.in
|
scripts/pkgdelta.sh.in
|
||||||
scripts/repo-add.sh.in
|
scripts/repo-add.sh.in
|
||||||
scripts/libmakepkg/tidy/build_references.sh.in
|
scripts/libmakepkg/lint_package.sh.in
|
||||||
|
scripts/libmakepkg/lint_package/build_references.sh.in
|
||||||
|
scripts/libmakepkg/lint_package/missing_backup.sh.in
|
||||||
|
scripts/libmakepkg/tidy.sh.in
|
||||||
scripts/libmakepkg/tidy/docs.sh.in
|
scripts/libmakepkg/tidy/docs.sh.in
|
||||||
scripts/libmakepkg/tidy/emptydirs.sh.in
|
scripts/libmakepkg/tidy/emptydirs.sh.in
|
||||||
scripts/libmakepkg/tidy/libtool.sh.in
|
scripts/libmakepkg/tidy/libtool.sh.in
|
||||||
scripts/libmakepkg/tidy/missing_backup.sh.in
|
|
||||||
scripts/libmakepkg/tidy/optipng.sh.in
|
scripts/libmakepkg/tidy/optipng.sh.in
|
||||||
scripts/libmakepkg/tidy/purge.sh.in
|
scripts/libmakepkg/tidy/purge.sh.in
|
||||||
scripts/libmakepkg/tidy/staticlibs.sh.in
|
scripts/libmakepkg/tidy/staticlibs.sh.in
|
||||||
|
|
Loading…
Reference in New Issue