This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3542

packaging: move some docker scripts into contrib/packaging/
ClosedPublic

Authored by indygreg on May 12 2018, 5:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1868db0d1515: packaging: move some docker scripts into contrib/packaging/
Summary

This required some minor path adjustments in the scripts.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.May 12 2018, 5:19 PM
Closed by commit rHG1868db0d1515: packaging: move some docker scripts into contrib/packaging/ (authored by indygreg). · Explain WhyMay 15 2018, 8:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8687

Makefile

ppa: ppa:
contrib/builddeb --source-only contrib/builddeb --source-only
contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
sed "s/__CODENAME__/$*/" $< > $@ sed "s/__CODENAME__/$*/" $< > $@
docker-debian-jessie: contrib/packaging/docker/debian-jessie docker-debian-jessie: contrib/packaging/docker/debian-jessie
contrib/dockerdeb debian jessie contrib/packaging/dockerdeb debian jessie
docker-debian-stretch: contrib/packaging/docker/debian-stretch docker-debian-stretch: contrib/packaging/docker/debian-stretch
contrib/dockerdeb debian stretch contrib/packaging/dockerdeb debian stretch
contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
sed "s/__CODENAME__/$*/" $< > $@ sed "s/__CODENAME__/$*/" $< > $@
docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty
contrib/dockerdeb ubuntu trusty contrib/packaging/dockerdeb ubuntu trusty
docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty
contrib/dockerdeb ubuntu trusty --source-only contrib/packaging/dockerdeb ubuntu trusty --source-only
docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial
contrib/dockerdeb ubuntu xenial contrib/packaging/dockerdeb ubuntu xenial
docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial
contrib/dockerdeb ubuntu xenial --source-only contrib/packaging/dockerdeb ubuntu xenial --source-only
docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful
contrib/dockerdeb ubuntu artful contrib/packaging/dockerdeb ubuntu artful
docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful
contrib/dockerdeb ubuntu artful --source-only contrib/packaging/dockerdeb ubuntu artful --source-only
docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic
contrib/dockerdeb ubuntu bionic contrib/packaging/dockerdeb ubuntu bionic
docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic
contrib/dockerdeb ubuntu bionic --source-only contrib/packaging/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-fedora20: docker-fedora20:
mkdir -p packages/fedora20 mkdir -p packages/fedora20
contrib/dockerrpm fedora20 contrib/packaging/dockerrpm fedora20
fedora21: fedora21:
mkdir -p packages/fedora21 mkdir -p packages/fedora21
contrib/buildrpm contrib/buildrpm
cp rpmbuild/RPMS/*/* packages/fedora21 cp rpmbuild/RPMS/*/* packages/fedora21
cp rpmbuild/SRPMS/* packages/fedora21 cp rpmbuild/SRPMS/* packages/fedora21
rm -rf rpmbuild rm -rf rpmbuild
docker-fedora21: docker-fedora21:
mkdir -p packages/fedora21 mkdir -p packages/fedora21
contrib/dockerrpm fedora21 contrib/packaging/dockerrpm fedora21
centos5: centos5:
mkdir -p packages/centos5 mkdir -p packages/centos5
contrib/buildrpm --withpython contrib/buildrpm --withpython
cp rpmbuild/RPMS/*/* packages/centos5 cp rpmbuild/RPMS/*/* packages/centos5
cp rpmbuild/SRPMS/* packages/centos5 cp rpmbuild/SRPMS/* packages/centos5
docker-centos5: docker-centos5:
mkdir -p packages/centos5 mkdir -p packages/centos5
contrib/dockerrpm centos5 --withpython contrib/packaging/dockerrpm centos5 --withpython
centos6: centos6:
mkdir -p packages/centos6 mkdir -p packages/centos6
contrib/buildrpm --withpython contrib/buildrpm --withpython
cp rpmbuild/RPMS/*/* packages/centos6 cp rpmbuild/RPMS/*/* packages/centos6
cp rpmbuild/SRPMS/* packages/centos6 cp rpmbuild/SRPMS/* packages/centos6
docker-centos6: docker-centos6:
mkdir -p packages/centos6 mkdir -p packages/centos6
contrib/dockerrpm centos6 --withpython contrib/packaging/dockerrpm centos6 --withpython
centos7: centos7:
mkdir -p packages/centos7 mkdir -p packages/centos7
contrib/buildrpm contrib/buildrpm
cp rpmbuild/RPMS/*/* packages/centos7 cp rpmbuild/RPMS/*/* packages/centos7
cp rpmbuild/SRPMS/* packages/centos7 cp rpmbuild/SRPMS/* packages/centos7
docker-centos7: docker-centos7:
mkdir -p packages/centos7 mkdir -p packages/centos7
contrib/dockerrpm centos7 contrib/packaging/dockerrpm centos7
linux-wheels: linux-wheels-x86_64 linux-wheels-i686 linux-wheels: linux-wheels-x86_64 linux-wheels-i686
linux-wheels-x86_64: 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 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: 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 docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/build-linux-wheels.sh

contrib/dockerdeb

  • This file was moved to contrib/packaging/dockerdeb.

contrib/dockerlib.sh

  • This file was moved to contrib/packaging/dockerlib.sh.

contrib/dockerrpm

  • This file was moved to contrib/packaging/dockerrpm.

contrib/packaging/dockerdeb

  • This file was moved from contrib/dockerdeb.
#!/bin/bash -eu #!/bin/bash -eu
. $(dirname $0)/dockerlib.sh . $(dirname $0)/dockerlib.sh
. $(dirname $0)/packagelib.sh . $(dirname $0)/../packagelib.sh
BUILDDIR=$(dirname $0) BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/.. > /dev/null; pwd) export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
checkdocker checkdocker
DISTID="$1" DISTID="$1"
CODENAME="$2" CODENAME="$2"
PLATFORM="$1-$2" PLATFORM="$1-$2"
shift; shift # extra params are passed to build process shift; shift # extra params are passed to build process

contrib/packaging/dockerlib.sh

  • This file was moved from contrib/dockerlib.sh.

contrib/packaging/dockerrpm

  • This file was moved from contrib/dockerrpm.
#!/bin/bash -e #!/bin/bash -e
. $(dirname $0)/dockerlib.sh . $(dirname $0)/dockerlib.sh
BUILDDIR=$(dirname $0) BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/..; pwd) export ROOTDIR=$(cd $BUILDDIR/../..; pwd)
checkdocker checkdocker
PLATFORM="$1" PLATFORM="$1"
shift # extra params are passed to buildrpm shift # extra params are passed to buildrpm
initcontainer $PLATFORM initcontainer $PLATFORM