mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-06 09:20:32 +01:00
contrib/rpm: add --quick argument to build_clean.sh script
Before, build_clean.sh always required building all NetworkManager
and doing another `make distcheck` before calling rpmbuild.
That is still a good idea, to ensure that we get a proper build.
For some quick testing however, lets speed this up with a new
--dist argument that only calls `make dist`.
Signed-off-by: Thomas Haller <thaller@redhat.com>
(cherry picked from commit 40a3e20006)
This commit is contained in:
parent
e94e36342f
commit
a95184dc03
1 changed files with 15 additions and 4 deletions
|
|
@ -7,13 +7,14 @@ die() {
|
|||
}
|
||||
|
||||
usage() {
|
||||
echo "USAGE: $0 [-h|--help|-?|help] [-f|--force] [-c|--clean]"
|
||||
echo "USAGE: $0 [-h|--help|-?|help] [-f|--force] [-c|--clean] [-Q|--quick]"
|
||||
echo
|
||||
echo "Does all the steps from a clean working directory to an RPM of NetworkManager"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " --force: force build, even if working directory is not clean and has local modifications"
|
||||
echo " --clean: run \`git-clean -fdx :/\` before build"
|
||||
echo " --quick: only run \`make dist\` instead of \`make distcheck\`"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -28,6 +29,7 @@ cd "$GITDIR" || die "could not change to $GITDIR"
|
|||
|
||||
IGNORE_DIRTY=0
|
||||
GIT_CLEAN=0
|
||||
QUICK=0
|
||||
|
||||
for A; do
|
||||
case "$A" in
|
||||
|
|
@ -41,6 +43,9 @@ for A; do
|
|||
-c|--clean)
|
||||
GIT_CLEAN=1
|
||||
;;
|
||||
-Q|--quick)
|
||||
QUICK=1
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
die "Unexpected argument \"$A\""
|
||||
|
|
@ -66,9 +71,15 @@ fi
|
|||
|
||||
./autogen.sh --enable-gtk-doc || die "Error autogen.sh"
|
||||
|
||||
make -j 10 || die "Error make"
|
||||
|
||||
make distcheck || die "Error make distcheck"
|
||||
if [[ $QUICK == 1 ]]; then
|
||||
for DIR in ./libnm-util/ ./libnm-glib/ ./tools/ ./docs/ ; do
|
||||
make -C "$DIR" || die "Error make -C \"$DIR\""
|
||||
done
|
||||
make dist || die "Error make distcheck"
|
||||
else
|
||||
make -j 10 || die "Error make"
|
||||
make distcheck || die "Error make distcheck"
|
||||
fi
|
||||
|
||||
"$SCRIPTDIR"/build.sh
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue