facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-06 21:48:36 +03:00
Code Issues Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Augie Fackler 2017-06-24 15:50:13 -04:00
commit 4b4be91515
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -30,6 +30,7 @@ build
contrib/chg/chg
contrib/hgsh/hgsh
contrib/vagrant/.vagrant
contrib/docker/debian-*
contrib/docker/ubuntu-*
dist
packages

18
Makefile
View File

@ -203,10 +203,17 @@ deb:
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: contrib/docker/ubuntu-yakkety
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 @@ linux-wheels-i686:
.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

3
contrib/docker/debian-jessie → contrib/docker/debian.template
View File

@ -1,9 +1,10 @@
FROM debian:jessie
FROM debian:__CODENAME__
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
dh-python \
devscripts \
less \
python \
python-all-dev \
python-docutils \

1
contrib/docker/ubuntu.template
View File

@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y \
debhelper \
dh-python \
devscripts \
less \
python \
python-all-dev \
python-docutils \