Mercurial > hg-stable

changeset 32150:5c1283713293 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make: templatize Debian build target a la e63dfbbdbd07
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 23 Jun 2017 13:08:46 +0800
parents 9b690032fe07
children 231690dba9b4
files .hgignore Makefile contrib/docker/debian-jessie contrib/docker/debian.template
diffstat 4 files changed, 17 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Jun 23 12:04:12 2017 +0800
+++ b/.hgignore	Fri Jun 23 13:08:46 2017 +0800
@@ -30,6 +30,7 @@
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
+contrib/docker/debian-*
 contrib/docker/ubuntu-*
 dist
 packages
--- a/Makefile	Fri Jun 23 12:04:12 2017 +0800
+++ b/Makefile	Fri Jun 23 13:08:46 2017 +0800
@@ -196,7 +196,10 @@
 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
 
--- a/contrib/docker/debian-jessie	Fri Jun 23 12:04:12 2017 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-FROM debian:jessie
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  debhelper \
-  dh-python \
-  devscripts \
-  less \
-  python \
-  python-all-dev \
-  python-docutils \
-  zip \
-  unzip
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/docker/debian.template	Fri Jun 23 13:08:46 2017 +0800
@@ -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