bm-prep () {
t-tstunt-parsechangelog
+ t-tstunt dpkg-deb
t-prep-newpackage example 1.0
dpkgbuildpackage_deps_for_clean=false
fi
- cleanmodes_default="git none dpkg-source dpkg-source-d"
+ cleanmodes_default="git none"
+ cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra"
+ cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra"
cleanmodes_all="$cleanmodes_default git-ff check"
+ cleanmodes_all+=" git,always git,always"
cleanmodes="$cleanmodes_default"
}
bm-prep-ownpackage-branches for-build-modes
- cleanmodes='git dpkg-source'
+ cleanmodes='git dpkg-source,no-check'
for act in "$@"; do
bm-guess-e-source-e-targets "$act"
# provide sbuild with the dsc, not the tree, so we simply
# ignore all executions of the clean target by schroot.
local arch; arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
- local sblog=../example_${v}_$arch.build
+ local sblog=$bpd/example_${v}_$arch.build
if [ -e $sblog ]; then
sed '
s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/;
*[^\ ]*)
;;
*)
- # dgit won't bother cleaning the tree
- # if no build is going to be run
- eff_cleanmode=none
+ # if no build is going to be run, dgit will only check
+ # cleanliness rather than actually cleaning
+ eff_cleanmode=C$cleanmode
;;
esac
case "$act" in
sbuild*)
- # dgit sbuild won't bother cleaning the tree
+ # dgit sbuild will only check cleanliness
# because it doesn't need to to make a .dsc for sbuild
- eff_cleanmode=none
+ eff_cleanmode=C$cleanmode
;;
esac
# that too and reset eff_cleanmode to $cleanmode
case $eff_cleanmode in
- git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
- git-ff) echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
- check) echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
- dpkg-source-d) echo >&4 "EXAMPLE RULES TARGET clean" ;;
- dpkg-source) bm-build-deps-ok || tolerate_fail=tolerate
+ git|Cgit,always)
+ echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
+ git-ff|Cgit-ff,always)
+ echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
+ check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
+ dpkg-source-d|dpkg-source-d,no-check)
echo >&4 "EXAMPLE RULES TARGET clean"
;;
- none) ;;
+ dpkg-source|dpkg-source,no-check)
+ bm-build-deps-ok || tolerate_fail=tolerate
+ echo >&4 "EXAMPLE RULES TARGET clean"
+ ;;
+ none|Cnone) ;;
+ Cdpkg-source*) ;; # handled below
+ Cgit|Cgit-ff) echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;;
*) fail "t-compute-expected-run $cleanmode ??" ;;
esac
+ case $eff_cleanmode in
+ dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d)
+ echo >&4 'BUILD-MODES PROGRAM git clean -dn'
+ ;;
+ dpkg-source*,no-check|Cdpkg-source*,no-check)
+ ;;
+ Cdpkg-source*) fail "t-compute-expected-run wd $cleanmode ??" ;;
+ esac
+
if [ "x$e_targets" != x ]; then
# e_targets can be " " to mean `/may/ fail due to b-d'
bm-build-deps-ok || tolerate_fail=tolerate
bmid="$act,$cleanmode,$branch"
bmid=${bmid// /_}
- rm -f ../${p}_{v}_*.changes
+ rm -f $bpd/${p}_{v}_*.changes
heading="===== [$bmid] dgit $args ====="
git checkout $branch
git clean -xdf # since we might not do any actual cleaning
- dsc="../example_$v.dsc"
+ dsc="$bpd/example_$v.dsc"
rm -f $dsc
set +o pipefail
bm-report-test "SOURCE FILE" [ -e $dsc ]
if [ $actual_status = success ]; then
- local changes; changes=$(echo ../example_${v}_*.changes)
+ local changes; changes=$(echo $bpd/example_${v}_*.changes)
case "$changes" in
*' '*) fail "build generated ambiguous .changes: $changes" ;;
esac
done
: bm-act-iterate done.
}
+
+bm-buildproductsdir-nonworking () {
+ t-git-config dgit.default.build-products-dir ../bpd-dummy
+}