Skip to content
Snippets Groups Projects
Commit 1335bbfb authored by Gregory Szorc's avatar Gregory Szorc
Browse files

packaging: move most of contrib/docker to contrib/packaging/docker

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.

Differential Revision: https://phab.mercurial-scm.org/D3541
parent cd4959c3
No related branches found
No related tags found
No related merge requests found
......@@ -31,8 +31,8 @@
contrib/chg/chg
contrib/hgsh/hgsh
contrib/vagrant/.vagrant
contrib/docker/debian-*
contrib/docker/ubuntu-*
contrib/packaging/docker/debian-*
contrib/packaging/docker/ubuntu-*
dist
packages
doc/common.txt
......
......@@ -209,6 +209,6 @@
ppa:
contrib/builddeb --source-only
contrib/docker/debian-%: contrib/docker/debian.template
contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
sed "s/__CODENAME__/$*/" $< > $@
......@@ -213,5 +213,5 @@
sed "s/__CODENAME__/$*/" $< > $@
docker-debian-jessie: contrib/docker/debian-jessie
docker-debian-jessie: contrib/packaging/docker/debian-jessie
contrib/dockerdeb debian jessie
......@@ -216,5 +216,5 @@
contrib/dockerdeb debian jessie
docker-debian-stretch: contrib/docker/debian-stretch
docker-debian-stretch: contrib/packaging/docker/debian-stretch
contrib/dockerdeb debian stretch
......@@ -219,5 +219,5 @@
contrib/dockerdeb debian stretch
contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
sed "s/__CODENAME__/$*/" $< > $@
......@@ -222,5 +222,5 @@
sed "s/__CODENAME__/$*/" $< > $@
docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty
contrib/dockerdeb ubuntu trusty
......@@ -225,5 +225,5 @@
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
......@@ -228,5 +228,5 @@
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
......@@ -231,5 +231,5 @@
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
......@@ -234,5 +234,5 @@
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
......@@ -237,5 +237,5 @@
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
......@@ -240,5 +240,5 @@
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
......@@ -243,6 +243,6 @@
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
fedora20:
......
......@@ -22,7 +22,7 @@
function initcontainer() {
[ "$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; }
CONTAINER="hg-dockerrpm-$1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment