##// END OF EJS Templates
shelve: directly handle the abort process...
shelve: directly handle the abort process Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. This change starts with the simplest bits, handling the abort process. It turns out we have all the necessary bits in the `shelvestate` file. So we do not need anything from the interrupted rebase. As a nice side effect, a test about missing `shelverebasestate` state file now behave better. Differential Revision: https://phab.mercurial-scm.org/D3688

File last commit:

r38477:c8ef9d89 default
r38480:61e4cf1b default
Show More
dockerdeb
40 lines | 1.3 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 #!/bin/bash -eu
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 . $(dirname $0)/packagelib.sh
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
DISTID="$1"
CODENAME="$2"
PLATFORM="$1-$2"
shift; shift # extra params are passed to build process
OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 CONTAINER=hg-docker-$PLATFORM
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
r38477 $BUILDDIR/hg-docker build \
--build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \
$CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
# debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker
# container and hope it's writable. Whee.
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 dn=$(basename $ROOTDIR)
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475 DBUILDUSER=build
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean && make local"
fi
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean"
fi