From dcf94401c24260463049526daacfbab36d7b4615 Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Tue, 24 Dec 2013 19:16:18 +0400
Subject: [PATCH] Version 2.2.1: add mk-distr helper

---
 ANNOUNCE              |  3 +++
 MANIFEST.in           |  5 +++--
 Makefile              | 33 ++++-----------------------------
 mimedecode_version.py |  2 +-
 mk-distr              | 16 ++++++++++++++++
 5 files changed, 27 insertions(+), 32 deletions(-)
 create mode 100755 mk-distr

diff --git a/ANNOUNCE b/ANNOUNCE
index 6e333e8..673b7b5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -22,6 +22,9 @@ one part. If it is a MIME message with multiple parts ("attachments") all parts
 are decoded. Decoding can be controlled by command-line options.
 
 
+WHAT'S NEW in version 2.2.1 (2013-12-24)
+   Add mk-distr helper.
+
 WHAT'S NEW in version 2.2.0 (2013-12-21)
    Rename __version__.py to mimedecode_version.py.
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 9467125..27de3f5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
-include ANNOUNCE INSTALL.txt Makefile* MANIFEST.in ez_setup.py
-include mimedecode.docbook mimedecode.html mimedecode.txt mimedecode.man
+include ANNOUNCE INSTALL.txt Makefile* MANIFEST.in
+include mimedecode.docbook mimedecode.man mimedecode.html mimedecode.txt
+include ez_setup.py mk-distr
diff --git a/Makefile b/Makefile
index 6f80b91..c4c2827 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,10 @@
 
-VERSION=$(shell python -c "from __version__ import __version__; print __version__")
-
 .PHONY: all
-all: docs sdist
-
-DISTFILES = \
-ANNOUNCE \
-INSTALL.txt \
-MANIFEST.in \
-Makefile \
-Makefile.4xslt \
-Makefile.sgmlt \
-Makefile.xsltproc \
-mimedecode.docbook \
-mimedecode.html \
-mimedecode.man \
-mimedecode.py \
-mimedecode.txt \
-mimedecode_version.py \
-setup.py
+all: distr docs
 
-.PHONY: sdist
-sdist: dist/mimedecode-$(VERSION).tar.gz
-
-.PHONY: dist
-dist/mimedecode-$(VERSION).tar.gz: $(DISTFILES)
-	umask 022 && chmod a+rX $(DISTFILES) && python setup.py sdist --formats=bztar
+.PHONY: distr
+distr:
+	./mk-distr
 
 .PHONY: docs
 docs: mimedecode.man mimedecode.txt mimedecode.html
@@ -38,7 +17,3 @@ CLEANFILES = *.py[co] MANIFEST
 .PHONY: clean
 clean:
 	rm -f $(CLEANFILES)
-
-.PHONY: distclean
-distclean: clean
-	rm -rf dist
diff --git a/mimedecode_version.py b/mimedecode_version.py
index f141af2..958a0b6 100644
--- a/mimedecode_version.py
+++ b/mimedecode_version.py
@@ -1,4 +1,4 @@
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2001-2013 PhiloSoft Design"
 __license__ = "GNU GPL"
diff --git a/mk-distr b/mk-distr
new file mode 100755
index 0000000..e31fbdc
--- /dev/null
+++ b/mk-distr
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+umask 022
+
+if [ -n "$1" ]; then
+   git checkout "$1"
+fi &&
+
+git archive --format=tar --prefix=mimedecode/ HEAD |
+   (cd "$HOME/tmp" && exec tar xf -) &&
+cp -p mimedecode.man mimedecode.html mimedecode.txt "$HOME/tmp/mimedecode" &&
+
+cd "$HOME/tmp/mimedecode" &&
+chmod a+r mimedecode.man mimedecode.html mimedecode.txt &&
+python setup.py sdist &&
+cd dist && mv mimedecode-*.tar.gz ../.. && cd ../.. && exec rm -rf mimedecode
-- 
2.39.5