summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-02-01 21:59:02 +1000
committerAllan McRae <allan@archlinux.org>2015-02-12 14:00:55 +1000
commitbfe9b56e1fe3a0c17fa535acf8d29bbe318c0b8a (patch)
tree932e37b78b829a8f7670b41339eea8591199ab7a
parent68602f49316dd0c115805773da5825fae1cb8cdf (diff)
downloadpacman-bfe9b56e1fe3a0c17fa535acf8d29bbe318c0b8a.tar.xz
libmakepkg: move package checking out of tidy_install
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/Makefile.am6
-rw-r--r--scripts/libmakepkg/.gitignore5
-rw-r--r--scripts/libmakepkg/lint_package.sh.in38
-rw-r--r--scripts/libmakepkg/lint_package/build_references.sh.in (renamed from scripts/libmakepkg/tidy/build_references.sh.in)4
-rw-r--r--scripts/libmakepkg/lint_package/missing_backup.sh.in (renamed from scripts/libmakepkg/tidy/missing_backup.sh.in)4
-rw-r--r--scripts/libmakepkg/tidy.sh.in5
-rw-r--r--scripts/makepkg.sh.in2
-rw-r--r--scripts/po/POTFILES.in6
8 files changed, 55 insertions, 15 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4745b6e0..57468f93 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -41,6 +41,7 @@ LIBRARY = \
libmakepkgdir = $(datarootdir)/makepkg
LIBMAKEPKGDIRS = \
+ lint_package \
tidy \
util
@@ -49,12 +50,13 @@ LIBMAKEPKG = \
libmakepkg/util/option.sh
LIBMAKEPKG_IN = \
+ libmakepkg/lint_package.sh \
+ libmakepkg/lint_package/build_references.sh \
+ libmakepkg/lint_package/missing_backup.sh \
libmakepkg/tidy.sh \
- libmakepkg/tidy/build_references.sh \
libmakepkg/tidy/docs.sh \
libmakepkg/tidy/emptydirs.sh \
libmakepkg/tidy/libtool.sh \
- libmakepkg/tidy/missing_backup.sh \
libmakepkg/tidy/optipng.sh \
libmakepkg/tidy/purge.sh \
libmakepkg/tidy/staticlibs.sh \
diff --git a/scripts/libmakepkg/.gitignore b/scripts/libmakepkg/.gitignore
index 7072d8b9..6101db46 100644
--- a/scripts/libmakepkg/.gitignore
+++ b/scripts/libmakepkg/.gitignore
@@ -1,9 +1,10 @@
+lint_package.sh
+lint_package/build_references.sh
+lint_package/missing_backup.sh
tidy.sh
-tidy/build_references.sh
tidy/docs.sh
tidy/emptydirs.sh
tidy/libtool.sh
-tidy/missing_backup.sh
tidy/optipng.sh
tidy/purge.sh
tidy/staticlibs.sh
diff --git a/scripts/libmakepkg/lint_package.sh.in b/scripts/libmakepkg/lint_package.sh.in
new file mode 100644
index 00000000..c2d3e322
--- /dev/null
+++ b/scripts/libmakepkg/lint_package.sh.in
@@ -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
+}
diff --git a/scripts/libmakepkg/tidy/build_references.sh.in b/scripts/libmakepkg/lint_package/build_references.sh.in
index 2611869a..f6de2900 100644
--- a/scripts/libmakepkg/tidy/build_references.sh.in
+++ b/scripts/libmakepkg/lint_package/build_references.sh.in
@@ -18,8 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-[ -n "$LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH" ] && return
-LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH=1
+[ -n "$LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH" ] && return
+LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
diff --git a/scripts/libmakepkg/tidy/missing_backup.sh.in b/scripts/libmakepkg/lint_package/missing_backup.sh.in
index fae04a27..d1008749 100644
--- a/scripts/libmakepkg/tidy/missing_backup.sh.in
+++ b/scripts/libmakepkg/lint_package/missing_backup.sh.in
@@ -18,8 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-[ -n "$LIBMAKEPKG_TIDY_MISSING_BACKUP_SH" ] && return
-LIBMAKEPKG_TIDY_MISSING_BACKUP_SH=1
+[ -n "$LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH" ] && return
+LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH=1
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
diff --git a/scripts/libmakepkg/tidy.sh.in b/scripts/libmakepkg/tidy.sh.in
index 483afcbf..b8c2965c 100644
--- a/scripts/libmakepkg/tidy.sh.in
+++ b/scripts/libmakepkg/tidy.sh.in
@@ -47,11 +47,6 @@ tidy_install() {
tidy_staticlibs
tidy_emptydirs
- # warn about packaging issues
- # TODO: move these to another module
- warn_missing_backup
- warn_build_references
-
# options that reduce file sizes
tidy_zipman
tidy_strip
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index c01e9399..f47dc358 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2891,6 +2891,7 @@ run_split_packaging() {
backup_package_variables
run_package $pkgname
tidy_install
+ lint_package
create_package
create_debug_package
restore_package_variables
@@ -3348,6 +3349,7 @@ if (( INFAKEROOT )); then
run_package
fi
tidy_install
+ lint_package
create_package
create_debug_package
else
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index 007227a6..b25e53b6 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -8,11 +8,13 @@ scripts/pacman-key.sh.in
scripts/pacman-optimize.sh.in
scripts/pkgdelta.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/emptydirs.sh.in
scripts/libmakepkg/tidy/libtool.sh.in
-scripts/libmakepkg/tidy/missing_backup.sh.in
scripts/libmakepkg/tidy/optipng.sh.in
scripts/libmakepkg/tidy/purge.sh.in
scripts/libmakepkg/tidy/staticlibs.sh.in