| hg-reviewers |
contrib/ is kind of a dumping ground for all kinds of random things.
Many of the files in contrib/ are related to packaging. But sorting
out how everything is related is a lot of effort since it is all
mixed together.
This commit starts the process of refactoring everything related
to packaging so it all lives under one roof.
Most content from contrib/docker is simply moved to
contrib/packaging/docker and all references are updated.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| tests/annotated | tests/annotated | ||||
| tests/exceptions | tests/exceptions | ||||
| tests/*.err | tests/*.err | ||||
| tests/htmlcov | tests/htmlcov | ||||
| build | build | ||||
| contrib/chg/chg | contrib/chg/chg | ||||
| contrib/hgsh/hgsh | contrib/hgsh/hgsh | ||||
| contrib/vagrant/.vagrant | contrib/vagrant/.vagrant | ||||
| contrib/docker/debian-* | contrib/packaging/docker/debian-* | ||||
| contrib/docker/ubuntu-* | contrib/packaging/docker/ubuntu-* | ||||
| dist | dist | ||||
| packages | packages | ||||
| doc/common.txt | doc/common.txt | ||||
| doc/*.[0-9] | doc/*.[0-9] | ||||
| doc/*.[0-9].txt | doc/*.[0-9].txt | ||||
| doc/*.[0-9].gendoc.txt | doc/*.[0-9].gendoc.txt | ||||
| doc/*.[0-9].{x,ht}ml | doc/*.[0-9].{x,ht}ml | ||||
| MANIFEST | MANIFEST | ||||
| "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg | "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg | ||||
| deb: | deb: | ||||
| contrib/builddeb | contrib/builddeb | ||||
| ppa: | ppa: | ||||
| contrib/builddeb --source-only | contrib/builddeb --source-only | ||||
| contrib/docker/debian-%: contrib/docker/debian.template | contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template | ||||
| sed "s/__CODENAME__/$*/" $< > $@ | sed "s/__CODENAME__/$*/" $< > $@ | ||||
| docker-debian-jessie: contrib/docker/debian-jessie | docker-debian-jessie: contrib/packaging/docker/debian-jessie | ||||
| contrib/dockerdeb debian jessie | contrib/dockerdeb debian jessie | ||||
| docker-debian-stretch: contrib/docker/debian-stretch | docker-debian-stretch: contrib/packaging/docker/debian-stretch | ||||
| contrib/dockerdeb debian stretch | contrib/dockerdeb debian stretch | ||||
| contrib/docker/ubuntu-%: contrib/docker/ubuntu.template | contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template | ||||
| sed "s/__CODENAME__/$*/" $< > $@ | sed "s/__CODENAME__/$*/" $< > $@ | ||||
| docker-ubuntu-trusty: contrib/docker/ubuntu-trusty | docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty | ||||
| contrib/dockerdeb ubuntu trusty | contrib/dockerdeb ubuntu trusty | ||||
| docker-ubuntu-trusty-ppa: contrib/docker/ubuntu-trusty | docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty | ||||
| contrib/dockerdeb ubuntu trusty --source-only | contrib/dockerdeb ubuntu trusty --source-only | ||||
| docker-ubuntu-xenial: contrib/docker/ubuntu-xenial | docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial | ||||
| contrib/dockerdeb ubuntu xenial | contrib/dockerdeb ubuntu xenial | ||||
| docker-ubuntu-xenial-ppa: contrib/docker/ubuntu-xenial | docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial | ||||
| contrib/dockerdeb ubuntu xenial --source-only | contrib/dockerdeb ubuntu xenial --source-only | ||||
| docker-ubuntu-artful: contrib/docker/ubuntu-artful | docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful | ||||
| contrib/dockerdeb ubuntu artful | contrib/dockerdeb ubuntu artful | ||||
| docker-ubuntu-artful-ppa: contrib/docker/ubuntu-artful | docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful | ||||
| contrib/dockerdeb ubuntu artful --source-only | contrib/dockerdeb ubuntu artful --source-only | ||||
| docker-ubuntu-bionic: contrib/docker/ubuntu-bionic | docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic | ||||
| contrib/dockerdeb ubuntu bionic | contrib/dockerdeb ubuntu bionic | ||||
| docker-ubuntu-bionic-ppa: contrib/docker/ubuntu-bionic | docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic | ||||
| contrib/dockerdeb ubuntu bionic --source-only | contrib/dockerdeb ubuntu bionic --source-only | ||||
| fedora20: | fedora20: | ||||
| mkdir -p packages/fedora20 | mkdir -p packages/fedora20 | ||||
| contrib/buildrpm | contrib/buildrpm | ||||
| cp rpmbuild/RPMS/*/* packages/fedora20 | cp rpmbuild/RPMS/*/* packages/fedora20 | ||||
| cp rpmbuild/SRPMS/* packages/fedora20 | cp rpmbuild/SRPMS/* packages/fedora20 | ||||
| rm -rf rpmbuild | rm -rf rpmbuild | ||||
| $DOCKER version | grep -Eq "^Client( version)?:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; } | $DOCKER version | grep -Eq "^Client( version)?:" || { echo "Error: unexpected output from \"$DOCKER version\""; exit 1; } | ||||
| $DOCKER version | grep -Eq "^Server( version)?:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; } | $DOCKER version | grep -Eq "^Server( version)?:" || { echo "Error: could not get docker server version - check it is running and your permissions"; exit 1; } | ||||
| } | } | ||||
| # Construct a container and leave its name in $CONTAINER for future use. | # Construct a container and leave its name in $CONTAINER for future use. | ||||
| function initcontainer() { | function initcontainer() { | ||||
| [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; } | [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; } | ||||
| DFILE="$ROOTDIR/contrib/docker/$1" | DFILE="$ROOTDIR/contrib/packaging/docker/$1" | ||||
| [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; } | [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; } | ||||
| CONTAINER="hg-dockerrpm-$1" | CONTAINER="hg-dockerrpm-$1" | ||||
| DBUILDUSER=build | DBUILDUSER=build | ||||
| ( | ( | ||||
| cat $DFILE | cat $DFILE | ||||
| if [ $(uname) = "Darwin" ] ; then | if [ $(uname) = "Darwin" ] ; then | ||||
| # The builder is using boot2docker on OS X, so we're going to | # The builder is using boot2docker on OS X, so we're going to | ||||