Mercurial > hg-stable
changeset 33045:91ae09010950
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 24 Jun 2017 15:50:13 -0400 |
| parents | 8e3021fd1a44 (current diff) 231690dba9b4 (diff) |
| children | 181ca34883e6 |
| files | .hgignore Makefile contrib/docker/debian-jessie |
| diffstat | 5 files changed, 30 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Jun 15 00:15:52 2017 -0700 +++ b/.hgignore Sat Jun 24 15:50:13 2017 -0400 @@ -30,6 +30,7 @@ contrib/chg/chg contrib/hgsh/hgsh contrib/vagrant/.vagrant +contrib/docker/debian-* contrib/docker/ubuntu-* dist packages
--- a/Makefile Thu Jun 15 00:15:52 2017 -0700 +++ b/Makefile Sat Jun 24 15:50:13 2017 -0400 @@ -203,10 +203,17 @@ ppa: contrib/builddeb --source-only -docker-debian-jessie: +contrib/docker/debian-%: contrib/docker/debian.template + sed "s/__CODENAME__/$*/" $< > $@ + +docker-debian-jessie: contrib/docker/debian-jessie mkdir -p packages/debian-jessie contrib/dockerdeb debian jessie +docker-debian-stretch: contrib/docker/debian-stretch + mkdir -p packages/debian-stretch + contrib/dockerdeb debian stretch + contrib/docker/ubuntu-%: contrib/docker/ubuntu.template sed "s/__CODENAME__/$*/" $< > $@ @@ -228,6 +235,12 @@ docker-ubuntu-yakkety-ppa: contrib/docker/ubuntu-yakkety contrib/dockerdeb ubuntu yakkety --source-only +docker-ubuntu-zesty: contrib/docker/ubuntu-zesty + contrib/dockerdeb ubuntu zesty + +docker-ubuntu-zesty-ppa: contrib/docker/ubuntu-zesty + contrib/dockerdeb ubuntu zesty --source-only + fedora20: mkdir -p packages/fedora20 contrib/buildrpm @@ -291,10 +304,11 @@ .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 update-pot \ - osx deb ppa docker-debian-jessie \ + 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-yakkety docker-ubuntu-yakkety-ppa \ + docker-ubuntu-zesty docker-ubuntu-zesty-ppa \ fedora20 docker-fedora20 fedora21 docker-fedora21 \ centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7 \ linux-wheels
--- a/contrib/docker/debian-jessie Thu Jun 15 00:15:52 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -FROM debian:jessie -RUN apt-get update && apt-get install -y \ - build-essential \ - debhelper \ - dh-python \ - devscripts \ - python \ - python-all-dev \ - python-docutils \ - zip \ - unzip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/docker/debian.template Sat Jun 24 15:50:13 2017 -0400 @@ -0,0 +1,12 @@ +FROM debian:__CODENAME__ +RUN apt-get update && apt-get install -y \ + build-essential \ + debhelper \ + dh-python \ + devscripts \ + less \ + python \ + python-all-dev \ + python-docutils \ + zip \ + unzip