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

.hgignore

@@ -1,70 +1,70 b''
 syntax: glob
 
 *.elc
 *.tmp
 *.orig
 *.rej
 *~
 *.mergebackup
 *.o
 *.so
 *.dll
 *.exe
 *.pyd
 *.pyc
 *.pyo
 *$py.class
 *.swp
 *.prof
 *.zip
 \#*\#
 .\#*
 tests/.coverage*
 tests/.testtimes*
 tests/.hypothesis
 tests/hypothesis-generated
 tests/annotated
 tests/exceptions
 tests/*.err
 tests/htmlcov
 build
 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
 doc/*.[0-9]
 doc/*.[0-9].txt
 doc/*.[0-9].gendoc.txt
 doc/*.[0-9].{x,ht}ml
 MANIFEST
 MANIFEST.in
 patches
 mercurial/__modulepolicy__.py
 mercurial/__version__.py
 mercurial/hgpythonlib.h
 mercurial.egg-info
 .DS_Store
 tags
 cscope.*
 .idea/*
 .asv/*
 i18n/hg.pot
 locale/*/LC_MESSAGES/hg.mo
 hgext/__index__.py
 
 rust/target/
 
 # Generated wheels
 wheelhouse/
 
 syntax: regexp
 ^\.pc/
 ^\.(pydev)?project
 
 # hackable windows distribution additions
 ^hg-python
 ^hg.py$

Makefile

@@ -1,323 +1,323 b''
 # If you want to change PREFIX, do not just edit it below. The changed
 # value wont get passed on to recursive make calls. You should instead
 # override the variable on the command like:
 #
 # % make PREFIX=/opt/ install
 
 export PREFIX=/usr/local
 PYTHON=python
 $(eval HGROOT := $(shell pwd))
 HGPYTHONS ?= $(HGROOT)/build/pythons
 PURE=
 PYFILES:=$(shell find mercurial hgext doc -name '*.py')
 DOCFILES=mercurial/help/*.txt
 export LANGUAGE=C
 export LC_ALL=C
 TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
 OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS)
 
 # Set this to e.g. "mingw32" to use a non-default compiler.
 COMPILER=
 
 COMPILERFLAG_tmp_ =
 COMPILERFLAG_tmp_${COMPILER} ?= -c $(COMPILER)
 COMPILERFLAG=${COMPILERFLAG_tmp_${COMPILER}}
 
 help:
 	@echo 'Commonly used make targets:'
 	@echo '  all          - build program and documentation'
 	@echo '  install      - install program and man pages to $$PREFIX ($(PREFIX))'
 	@echo '  install-home - install with setup.py install --home=$$HOME ($(HOME))'
 	@echo '  local        - build for inplace usage'
 	@echo '  tests        - run all tests in the automatic test suite'
 	@echo '  test-foo     - run only specified tests (e.g. test-merge1.t)'
 	@echo '  dist         - run all tests and create a source tarball in dist/'
 	@echo '  clean        - remove files created by other targets'
 	@echo '                 (except installed files or dist source tarball)'
 	@echo '  update-pot   - update i18n/hg.pot'
 	@echo
 	@echo 'Example for a system-wide installation under /usr/local:'
 	@echo '  make all && su -c "make install" && hg version'
 	@echo
 	@echo 'Example for a local installation (usable in this directory):'
 	@echo '  make local && ./hg version'
 
 all: build doc
 
 local:
 	$(PYTHON) setup.py $(PURE) \
 	  build_py -c -d . \
 	  build_ext $(COMPILERFLAG) -i \
 	  build_hgexe $(COMPILERFLAG) -i \
 	  build_mo
 	env HGRCPATH= $(PYTHON) hg version
 
 build:
 	$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)
 
 wheel:
 	FORCE_SETUPTOOLS=1 $(PYTHON) setup.py $(PURE) bdist_wheel $(COMPILERFLAG)
 
 doc:
 	$(MAKE) -C doc
 
 cleanbutpackages:
 	-$(PYTHON) setup.py clean --all # ignore errors from this command
 	find contrib doc hgext hgext3rd i18n mercurial tests hgdemandimport \
 		\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
 	rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
 	rm -f mercurial/__modulepolicy__.py
 	if test -d .hg; then rm -f mercurial/__version__.py; fi
 	rm -rf build mercurial/locale
 	$(MAKE) -C doc clean
 	$(MAKE) -C contrib/chg distclean
 
 clean: cleanbutpackages
 	rm -rf packages
 
 install: install-bin install-doc
 
 install-bin: build
 	$(PYTHON) setup.py $(PURE) install --root="$(DESTDIR)/" --prefix="$(PREFIX)" --force
 
 install-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) install
 
 install-home: install-home-bin install-home-doc
 
 install-home-bin: build
 	$(PYTHON) setup.py $(PURE) install --home="$(HOME)" --prefix="" --force
 
 install-home-doc: doc
 	cd doc && $(MAKE) $(MFLAGS) PREFIX="$(HOME)" install
 
 MANIFEST-doc:
 	$(MAKE) -C doc MANIFEST
 
 MANIFEST.in: MANIFEST-doc
 	hg manifest | sed -e 's/^/include /' > MANIFEST.in
 	echo include mercurial/__version__.py >> MANIFEST.in
 	sed -e 's/^/include /' < doc/MANIFEST >> MANIFEST.in
 
 dist:	tests dist-notests
 
 dist-notests:	doc MANIFEST.in
 	TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist
 
 check: tests
 
 tests:
 	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
 
 test-%:
 	cd tests && $(PYTHON) run-tests.py $(TESTFLAGS) $@
 
 testpy-%:
 	@echo Looking for Python $* in $(HGPYTHONS)
 	[ -e $(HGPYTHONS)/$*/bin/python ] || ( \
 	cd $$(mktemp --directory --tmpdir) && \
         $(MAKE) -f $(HGROOT)/contrib/Makefile.python PYTHONVER=$* PREFIX=$(HGPYTHONS)/$* python )
 	cd tests && $(HGPYTHONS)/$*/bin/python run-tests.py $(TESTFLAGS)
 
 check-code:
 	hg manifest | xargs python contrib/check-code.py
 
 format-c:
 	clang-format --style file -i \
 	  `hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"'`
 
 update-pot: i18n/hg.pot
 
 i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n/posplit i18n/hggettext
 	$(PYTHON) i18n/hggettext mercurial/commands.py \
 	  hgext/*.py hgext/*/__init__.py \
 	  mercurial/fileset.py mercurial/revset.py \
 	  mercurial/templatefilters.py \
 	  mercurial/templatefuncs.py \
 	  mercurial/templatekw.py \
 	  mercurial/filemerge.py \
 	  mercurial/hgweb/webcommands.py \
 	  mercurial/util.py \
 	  $(DOCFILES) > i18n/hg.pot.tmp
         # All strings marked for translation in Mercurial contain
         # ASCII characters only. But some files contain string
         # literals like this '\037\213'. xgettext thinks it has to
         # parse them even though they are not marked for translation.
         # Extracting with an explicit encoding of ISO-8859-1 will make
         # xgettext "parse" and ignore them.
 	echo $(PYFILES) | xargs \
 	  xgettext --package-name "Mercurial" \
 	  --msgid-bugs-address "<[e-mail]>" \
 	  --copyright-holder "Matt Mackall <[e-mail]> and others" \
 	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
 	  -d hg -p i18n -o hg.pot.tmp
 	$(PYTHON) i18n/posplit i18n/hg.pot.tmp
         # The target file is not created before the last step. So it never is in
         # an intermediate state.
 	mv -f i18n/hg.pot.tmp i18n/hg.pot
 
 %.po: i18n/hg.pot
         # work on a temporary copy for never having a half completed target
 	cp $@ $@.tmp
 	msgmerge --no-location --update $@.tmp $^
 	mv -f $@.tmp $@
 
 # Packaging targets
 
 osx:
 	rm -rf build/mercurial
 	/usr/bin/python2.7 setup.py install --optimize=1 \
 	  --root=build/mercurial/ --prefix=/usr/local/ \
 	  --install-lib=/Library/Python/2.7/site-packages/
 	make -C doc all install DESTDIR="$(PWD)/build/mercurial/"
         # Place a bogon .DS_Store file in the target dir so we can be
         # sure it doesn't get included in the final package.
 	touch build/mercurial/.DS_Store
         # install zsh completions - this location appears to be
         # searched by default as of macOS Sierra.
 	install -d build/mercurial/usr/local/share/zsh/site-functions/
 	install -m 0644 contrib/zsh_completion build/mercurial/usr/local/share/zsh/site-functions/_hg
         # install bash completions - there doesn't appear to be a
         # place that's searched by default for bash, so we'll follow
         # the lead of Apple's git install and just put it in a
         # location of our own.
 	install -d build/mercurial/usr/local/hg/contrib/
 	install -m 0644 contrib/bash_completion build/mercurial/usr/local/hg/contrib/hg-completion.bash
 	make -C contrib/chg \
 	  HGPATH=/usr/local/bin/hg \
 	  PYTHON=/usr/bin/python2.7 \
 	  HGEXTDIR=/Library/Python/2.7/site-packages/hgext \
 	  DESTDIR=../../build/mercurial \
 	  PREFIX=/usr/local \
 	  clean install
 	mkdir -p $${OUTPUTDIR:-dist}
 	HGVER=$$(python contrib/genosxversion.py $(OSXVERSIONFLAGS) build/mercurial/Library/Python/2.7/site-packages/mercurial/__version__.py) && \
 	OSXVER=$$(sw_vers -productVersion | cut -d. -f1,2) && \
 	pkgbuild --filter \\.DS_Store --root build/mercurial/ \
 	  --identifier org.mercurial-scm.mercurial \
 	  --version "$${HGVER}" \
 	  build/mercurial.pkg && \
 	productbuild --distribution contrib/macosx/distribution.xml \
 	  --package-path build/ \
 	  --version "$${HGVER}" \
 	  --resources contrib/macosx/ \
 	  "$${OUTPUTDIR:-dist/}"/Mercurial-"$${HGVER}"-macosx"$${OSXVER}".pkg
 
 deb:
 	contrib/builddeb
 
 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:
 	mkdir -p packages/fedora20
 	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/fedora20
 	cp rpmbuild/SRPMS/* packages/fedora20
 	rm -rf rpmbuild
 
 docker-fedora20:
 	mkdir -p packages/fedora20
 	contrib/dockerrpm fedora20
 
 fedora21:
 	mkdir -p packages/fedora21
 	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/fedora21
 	cp rpmbuild/SRPMS/* packages/fedora21
 	rm -rf rpmbuild
 
 docker-fedora21:
 	mkdir -p packages/fedora21
 	contrib/dockerrpm fedora21
 
 centos5:
 	mkdir -p packages/centos5
 	contrib/buildrpm --withpython
 	cp rpmbuild/RPMS/*/* packages/centos5
 	cp rpmbuild/SRPMS/* packages/centos5
 
 docker-centos5:
 	mkdir -p packages/centos5
 	contrib/dockerrpm centos5 --withpython
 
 centos6:
 	mkdir -p packages/centos6
 	contrib/buildrpm --withpython
 	cp rpmbuild/RPMS/*/* packages/centos6
 	cp rpmbuild/SRPMS/* packages/centos6
 
 docker-centos6:
 	mkdir -p packages/centos6
 	contrib/dockerrpm centos6 --withpython
 
 centos7:
 	mkdir -p packages/centos7
 	contrib/buildrpm
 	cp rpmbuild/RPMS/*/* packages/centos7
 	cp rpmbuild/SRPMS/* packages/centos7
 
 docker-centos7:
 	mkdir -p packages/centos7
 	contrib/dockerrpm centos7
 
 linux-wheels: linux-wheels-x86_64 linux-wheels-i686
 
 linux-wheels-x86_64:
 	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`:/src quay.io/pypa/manylinux1_x86_64 /src/contrib/build-linux-wheels.sh
 
 linux-wheels-i686:
 	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/build-linux-wheels.sh
 
 .PHONY: help all local build doc cleanbutpackages clean install install-bin \
 	install-doc install-home install-home-bin install-home-doc \
 	dist dist-notests check tests check-code format-c update-pot \
 	osx deb ppa \
 	docker-debian-jessie \
 	docker-debian-stretch \
 	docker-ubuntu-trusty docker-ubuntu-trusty-ppa \
 	docker-ubuntu-xenial docker-ubuntu-xenial-ppa \
 	docker-ubuntu-artful docker-ubuntu-artful-ppa \
 	docker-ubuntu-bionic docker-ubuntu-bionic-ppa \
 	fedora20 docker-fedora20 \
 	fedora21 docker-fedora21 \
 	centos5 docker-centos5 \
 	centos6 docker-centos6 \
 	centos7 docker-centos7 \
 	linux-wheels

contrib/dockerlib.sh

@@ -1,42 +1,42 b''
 #!/bin/sh -eu
 
 # This function exists to set up the DOCKER variable and verify that
 # it's the binary we expect. It also verifies that the docker service
 # is running on the system and we can talk to it.
 function checkdocker() {
   if which docker.io >> /dev/null 2>&1 ; then
     DOCKER=docker.io
   elif which docker >> /dev/null 2>&1 ; then
     DOCKER=docker
   else
     echo "Error: docker must be installed"
     exit 1
   fi
 
   $DOCKER -h 2> /dev/null | grep -q Jansens && { echo "Error: $DOCKER is the Docking System Tray - install docker.io instead"; 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; }
 }
 
 # Construct a container and leave its name in $CONTAINER for future use.
 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"
   DBUILDUSER=build
   (
     cat $DFILE
     if [ $(uname) = "Darwin" ] ; then
         # The builder is using boot2docker on OS X, so we're going to
         # *guess* the uid of the user inside the VM that is actually
         # running docker. This is *very likely* to fail at some point.
         echo RUN useradd $DBUILDUSER -u 1000
     else
         echo RUN groupadd $DBUILDUSER -g `id -g` -o
         echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o
     fi
   ) | $DOCKER build --build-arg http_proxy --build-arg https_proxy --tag $CONTAINER -
 }