D3541: packaging: move most of contrib/docker to contrib/packaging/docker
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sat May 12 21:19:19 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3541
AFFECTED FILES
.hgignore
Makefile
contrib/docker/centos5
contrib/docker/centos6
contrib/docker/centos7
contrib/docker/debian.template
contrib/docker/fedora20
contrib/docker/fedora21
contrib/docker/ubuntu.template
contrib/dockerlib.sh
contrib/packaging/docker/centos5
contrib/packaging/docker/centos6
contrib/packaging/docker/centos7
contrib/packaging/docker/debian.template
contrib/packaging/docker/fedora20
contrib/packaging/docker/fedora21
contrib/packaging/docker/ubuntu.template
CHANGE DETAILS
diff --git a/contrib/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template
rename from contrib/docker/ubuntu.template
rename to contrib/packaging/docker/ubuntu.template
diff --git a/contrib/docker/fedora21 b/contrib/packaging/docker/fedora21
rename from contrib/docker/fedora21
rename to contrib/packaging/docker/fedora21
diff --git a/contrib/docker/fedora20 b/contrib/packaging/docker/fedora20
rename from contrib/docker/fedora20
rename to contrib/packaging/docker/fedora20
diff --git a/contrib/docker/debian.template b/contrib/packaging/docker/debian.template
rename from contrib/docker/debian.template
rename to contrib/packaging/docker/debian.template
diff --git a/contrib/docker/centos7 b/contrib/packaging/docker/centos7
rename from contrib/docker/centos7
rename to contrib/packaging/docker/centos7
diff --git a/contrib/docker/centos6 b/contrib/packaging/docker/centos6
rename from contrib/docker/centos6
rename to contrib/packaging/docker/centos6
diff --git a/contrib/docker/centos5 b/contrib/packaging/docker/centos5
rename from contrib/docker/centos5
rename to contrib/packaging/docker/centos5
diff --git a/contrib/dockerlib.sh b/contrib/dockerlib.sh
--- a/contrib/dockerlib.sh
+++ b/contrib/dockerlib.sh
@@ -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"
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -209,40 +209,40 @@
ppa:
contrib/builddeb --source-only
-contrib/docker/debian-%: contrib/docker/debian.template
+contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
sed "s/__CODENAME__/$*/" $< > $@
-docker-debian-jessie: contrib/docker/debian-jessie
+docker-debian-jessie: contrib/packaging/docker/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/docker/ubuntu-%: contrib/docker/ubuntu.template
+contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
sed "s/__CODENAME__/$*/" $< > $@
-docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
+docker-ubuntu-trusty: contrib/packaging/docker/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
-docker-ubuntu-xenial: contrib/docker/ubuntu-xenial
+docker-ubuntu-xenial: contrib/packaging/docker/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
-docker-ubuntu-artful: contrib/docker/ubuntu-artful
+docker-ubuntu-artful: contrib/packaging/docker/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
-docker-ubuntu-bionic: contrib/docker/ubuntu-bionic
+docker-ubuntu-bionic: contrib/packaging/docker/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
fedora20:
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -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
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list