summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-07-04 19:35:37 +0200
committerThomas Haller <thaller@redhat.com>2014-07-04 19:59:08 +0200
commit40a3e20006bbc24285c9b637f4cdbb54eb4968bb (patch)
treee3c1560e9419cb0ff636afe798a839d3a22af7aa
parentd2be2ac78d0c8889a991b7882604218c56240d51 (diff)
downloadNetworkManager-40a3e20006bbc24285c9b637f4cdbb54eb4968bb.tar.gz
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>
-rwxr-xr-xcontrib/fedora/rpm/build_clean.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh
index f14f55f923..bac74c6fd0 100755
--- a/contrib/fedora/rpm/build_clean.sh
+++ b/contrib/fedora/rpm/build_clean.sh
@@ -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,14 @@ 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
+ make -C libnm-util || die "Error make -C libnm-util"
+ make -C libnm-glib || die "Error make -C libnm-glib"
+ make dist || die "Error make distcheck"
+else
+ make -j 10 || die "Error make"
+ make distcheck || die "Error make distcheck"
+fi
"$SCRIPTDIR"/build.sh