~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/emacs: Some more addresses for BBDB to ignore.
[profile]
/
bin
/
mdw-build
diff --git
a/bin/mdw-build
b/bin/mdw-build
index
572aa75
..
24ae04a
100755
(executable)
--- a/
bin/mdw-build
+++ b/
bin/mdw-build
@@
-59,6
+59,7
@@
set -e
unset checkout checkoutrev
unset setup setupcmd
unset sign signkey
unset checkout checkoutrev
unset setup setupcmd
unset sign signkey
+unset sbuild sbuildsrv
unset upload uploadpath
unset dput dputtarget
unset build distcheck debian clean vpath native
unset upload uploadpath
unset dput dputtarget
unset build distcheck debian clean vpath native
@@
-82,6
+83,7
@@
default_depends () {
: ${clean=yes}
: ${vpath=yes}
: ${native=yes}
: ${clean=yes}
: ${vpath=yes}
: ${native=yes}
+default_depends sbuild sbuildsrv
default_depends sign signkey
default_depends upload uploadpath
default_depends dput dputtarget
default_depends sign signkey
default_depends upload uploadpath
default_depends dput dputtarget
@@
-107,6
+109,7
@@
Build options:
[no]dput[=TARGET]
[no]clean
[no]vpath
[no]dput[=TARGET]
[no]clean
[no]vpath
+ [no]sbuild[=SERVER]
[no]sign[=KEYID]
[no]native
EOF
[no]sign[=KEYID]
[no]native
EOF
@@
-144,6
+147,8
@@
for opt; do
upload=*) upload=yes uploadpath=${opt#*=} ;;
sign) maybe_set sign signkey ;;
sign=*) sign=yes signkey=${opt#*=} ;;
upload=*) upload=yes uploadpath=${opt#*=} ;;
sign) maybe_set sign signkey ;;
sign=*) sign=yes signkey=${opt#*=} ;;
+ sbuild) maybe_set sbuild sbuildsrv ;;
+ sbuild=*) sbuild=yes sbuildsrv=${opt#*=} ;;
dput) maybe_set dput dputtarget ;;
dput=*) dput=yes dputtarget=${opt#*=} ;;
dput) maybe_set dput dputtarget ;;
dput=*) dput=yes dputtarget=${opt#*=} ;;
@@
-151,7
+156,7
@@
for opt; do
eval "$opt=yes"
;;
nocheckout | nosetup | nodistcheck | nodebian | \
eval "$opt=yes"
;;
nocheckout | nosetup | nodistcheck | nodebian | \
- noupload | nodput | noclean | novpath | nonative | nosign)
+ noupload | nodput | noclean | novpath | nonative | nos
build | nos
ign)
eval "${opt#no}=no"
;;
*)
eval "${opt#no}=no"
;;
*)
@@
-400,8
+405,10
@@
EOF
mv debian/changelog.new debian/changelog
;;
esac
mv debian/changelog.new debian/changelog
;;
esac
- case $build,$sign in
- release,yes) run dpkg-buildpackage -k$signkey ;;
+ case $sbuild,$build,$sign in
+ yes,release,yes) run mdw-sbuild -k$signkey $sbuildsrv ;;
+ yes,*) run mdw-sbuild $sbuildsrv ;;
+ no,release,yes) run dpkg-buildpackage -k$signkey ;;
no,*) run dpkg-buildpackage -us -uc ;;
esac
;;
no,*) run dpkg-buildpackage -us -uc ;;
esac
;;