X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f5b3423e1ed65ece2c7615b2fb372cc4d0e39850..ac50469854a9a88ee23ab35e17707aecb881c29e:/bin/mdw-build diff --git a/bin/mdw-build b/bin/mdw-build index bd1b457..45ca7f8 100755 --- a/bin/mdw-build +++ b/bin/mdw-build @@ -54,28 +54,72 @@ set -e ###-------------------------------------------------------------------------- +### Configuration. + +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 +for i in \ + "/etc/mdw-build.conf" \ + "${XDG_CONFIG_HOME-$HOME/.config}/mdw-build.conf" \ + "./.mdw-build.conf" +do + if [ -f "$i" ]; then . "$i"; fi +done +default_depends () { + var=$1 want=$2 + eval "p=\${$var+t} q=\${$want+t}" + case $p,$q in t,*) ;; *,t) eval "$var=yes" ;; *) eval "$var=no" ;; esac +} +: ${checkout=yes} ${checkoutrev=HEAD} +: ${build=test} +: ${setup=yes} ${setupcmd=mdw-setup} +: ${distcheck=yes} +: ${debian=yes} +: ${clean=yes} +: ${vpath=yes} +: ${native=yes} +: ${make=make} +default_depends sbuild sbuildsrv +default_depends sign signkey +default_depends upload uploadpath +default_depends dput dputtarget +: ${DEB_BUILD_OPTIONS=parallel=4}; export DEB_BUILD_OPTIONS + +###-------------------------------------------------------------------------- ### Parse options. +prog=${0##*/} + usage () { cat <&2 "$prog: $want not set"; exit 1 ;; + esac +} for opt; do case "$opt" in checkout) checkout=yes checkoutrev=HEAD ;; checkout=*) checkout=yes checkoutrev=${opt#*=} ;; - nocheckout) checkout=no ;; release) build=release ;; norelease) build=test ;; - - setup | distcheck | debian | upload | clean | vpath) + setup) setup=yes setupcmd=mdw-setup ;; + setup=*) setup=yes setupcmd=${opt#*=} ;; + upload) maybe_set upload uploadpath ;; + 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#*=} ;; + make=*) make=${opt#*=} ;; + + distcheck | debian | clean | vpath | native) eval "$opt=yes" ;; - nosetup | nodistcheck | nodebian | noupload | noclean | novpath) + nocheckout | nosetup | nodistcheck | nodebian | \ + noupload | nodput | noclean | novpath | nonative | nosbuild | nosign) eval "${opt#no}=no" ;; *) @@ -190,10 +244,18 @@ while [ ! -f configure.ac -a ! -f configure.in -a \ esac cd .. done -assign srcpath $(pwd) +assign toppath $(pwd) +assign srcpath $toppath + +## Build any necessary qualifiers. +qual= sep=. +case ${SBOX_SESSION_DIR+t},${DEB_BUILD_ARCH+t} in + t,t) qual=$qual$sep$DEB_BUILD_ARCH; sep=- ;; + t,*) fail "unknown build arch" ;; +esac ## Construct the output directory. -assign releasepath $srcpath/dist-$build +assign releasepath $srcpath/dist-$build$qual chmod -R +w $releasepath 2>/dev/null || : rm -rf $releasepath 2>/dev/null || : mkdir $releasepath @@ -217,7 +279,7 @@ case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in cd $srcpath [ "$(git ls-files -m)" = "" ] || warn "working tree has uncommitted changes" - gitver=$(git describe) + ;; esac ## Is there Debian build equipment? @@ -226,18 +288,13 @@ case "$debian,$(yesno [ -d $srcpath/debian ])" in info "No debian directory found." debian=no debver=none ;; + no,*) + debver=none + ;; yes,yes) debver=$(dpkg-parsechangelog | sed -n 's/^Version: //p') - ;; -esac - -## Check the version number. -case "$gitver,$debver" in - none,* | *,none) - ;; - *) - [ "$gitver" = "$debver" ] || - warn "Git version $gitver doesn't match Debian version $debver" + debsrc=$(dpkg-parsechangelog | sed -n 's/^Source: //p') + debname=$(git config user.name) debemail=$(git config user.email) ;; esac @@ -248,14 +305,38 @@ case "$checkout" in run git clone -sn $srcpath/.git _source assign srcpath $releasepath/_source cd $srcpath - run git checkout -b mdw-build $checkoutrev + run git update-ref refs/heads/mdw-build $checkoutrev "" + run git symbolic-ref HEAD refs/heads/mdw-build + run git read-tree --reset refs/heads/mdw-build + run git checkout-index -afu + assign gitversion "$(git describe --abbrev=4)" + ;; +esac + +## Check the version number. +hack_dch_p=no +case "$gitversion,$debver" in + none,* | *,none) + ;; + *) + dvref=$(echo "$debver" | tr '~' '_') + if [ "$gitversion" = "$dvref" ]; then + assign debversion "$debver" + else + warn "Git version $gitversion doesn't match Debian version $debver" + hack_dch=yes + dver=$(echo $gitversion | sed 's/-/+/; s/-/./g') + case $debver in *~) dver=$debver$dver ;; esac + assign debversion "$dver" + now=$(date -R) + fi ;; esac ## Maybe refresh the build machinery. case "$setup" in yes) - run mdw-setup + run $setupcmd ;; esac @@ -285,51 +366,84 @@ esac cat >find-distdir.mk <<'EOF' include Makefile print-distdir: - @echo $(distdir) + @echo >&3 $(distdir) EOF -assign distdir $(make -f find-distdir.mk print-distdir) +assign distdir \ + $({ $make -f find-distdir.mk print-distdir >/dev/null 2>&1; } 3>&1) ## Get a tarball distribution. case "$distcheck" in yes) - run make $makeopts distcheck + run $make $makeopts distcheck ;; no) - run make $makeopts dist + run $make $makeopts dist ;; esac cd $releasepath -if ! tar tf $buildpath/$distdir.tar.gz 2>/dev/null | grep -q RELEASE; then - fail "missing RELEASE file in distribution" -fi +case $native in + yes) + if ! tar tf $buildpath/$distdir.tar.gz 2>/dev/null | grep -q RELEASE + then + fail "missing RELEASE file in distribution" + fi + ;; +esac run mv $buildpath/$distdir.tar.gz . +case $build,$sign in + release,yes) + run gpg -u$signkey -ab -o$distdir.tar.gz.gpg $distdir.tar.gz + ;; +esac ## Maybe build the Debian packages. case "$debian" in yes) run tar xvfz $distdir.tar.gz cd $distdir - run dpkg-buildpackage -k$(mdw-conf releasekey) + case $hack_dch in + yes) + cat - debian/changelog >debian/changelog.new < $now + +EOF + mv debian/changelog.new debian/changelog + ;; + esac + sbuildargs=$sbuildsrv + case $sbuild,$build in + yes,release) + case $sign in yes) sbuildargs="-k$signkey $sbuildargs" ;; esac + ;; + yes,*) + if [ -d $toppath/dist-$build.pkgs ]; then + sbuildargs="-p$toppath/dist-$build.pkgs $sbuildargs" + fi + ;; + esac + case $sbuild,$build,$sign in + yes,*) run mdw-sbuild $sbuildargs ;; + no,release,yes) run dpkg-buildpackage -k$signkey ;; + no,*) run dpkg-buildpackage -us -uc ;; + esac ;; esac ## Maybe upload Debian packages. cd $releasepath case "$upload,$build" in - yes,test) - info "Test build: not uploading." - ;; - yes,release) - run rsync $distdir.tar.gz \ - $(mdw-conf upload-target ftp.distorted.org.uk:~ftp/pub/mdw/) - case "$debian" in - yes) - run dput -f $(mdw-conf dput-target distorted) *.changes - ;; - esac + yes,test) info "Test build: not uploading." ;; + yes,release) run rsync $distdir.tar.gz $distdir.tar.gz.gpg $uploadpath ;; +esac +case "$debian,$upload,$dput,$build" in + yes,yes,yes,release) run dput -f $dputtarget *.changes ;; esac ## Tidy up.