From d20ae0596d484c928df39b00f98c2ae4d223f7ce Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Oct 2012 19:07:50 +0200 Subject: [PATCH] pypi cleanups Signed-off-by: Nico Schottelius --- .gitignore | 1 + MANIFEST.in | 2 +- build | 77 +++++++++++++++++++---------------------------------- 3 files changed, 30 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 5fc6b0ad..71b70251 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ docs/man/man*/docbook-xsl.css # Python: cache, distutils __pycache__/ MANIFEST +dist/ diff --git a/MANIFEST.in b/MANIFEST.in index 6b86bbd0..b4935a92 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include docs/changelog docs/changelog-2.1 recursive-include docs/gfx *.png *.text -recursive-include docs *.text +recursive-include docs *.text *.html *.1 *.7 diff --git a/build b/build index bb8d60f5..4b5690ef 100755 --- a/build +++ b/build @@ -45,43 +45,12 @@ MAN7DSTDIR=${MANDIR}/man7 SPEECHESDIR=docs/speeches case "$1" in - man) - set -e - "$0" mangen - "$0" mantype - "$0" manbuild - ;; - - pypi-manifest) - # init MANIFEST - echo README > MANIFEST - - # bin - echo bin/cdist >> MANIFEST - - # main source - find cdist -type f >> MANIFEST - - # conf - find conf -type f >> MANIFEST - - # docs - ls docs/changelog* >> MANIFEST - find docs/gfx -type f >> MANIFEST - find docs/man/ -type f -name \*.text >> MANIFEST - find docs/man/ -type f -name \*.text.sh >> MANIFEST - - # other - find other/ -type f >> MANIFEST - - - ;; - - pypi) - $0 clean - $0 pypi-manifest - python3 setup.py sdist - ;; + man) + set -e + "$0" mangen + "$0" mantype + "$0" manbuild + ;; manbuild) trap abort INT @@ -119,6 +88,12 @@ case "$1" in ./docs/dev/releasechecklist ;; + pypi) + $0 very-clean + $0 man + python3 setup.py sdist + ;; + speeches) cd "$SPEECHESDIR" for speech in *tex; do @@ -164,19 +139,23 @@ case "$1" in done ;; - clean) - rm -f ${MAN7DSTDIR}/cdist-reference.text - find "${MANDIR}" -mindepth 2 -type l \ - -o -name "*.1" \ - -o -name "*.7" \ - -o -name "*.html" \ - -o -name "*.xml" \ - | xargs rm -f - - find * -name __pycache__ | xargs rm -rf + clean) + rm -f ${MAN7DSTDIR}/cdist-reference.text + find "${MANDIR}" -mindepth 2 -type l \ + -o -name "*.1" \ + -o -name "*.7" \ + -o -name "*.html" \ + -o -name "*.xml" \ + | xargs rm -f - rm -f MANIFEST - ;; + find * -name __pycache__ | xargs rm -rf + + rm -f MANIFEST + ;; + very-clean) + $0 clean + rm -rf cache/ + ;; test) shift # skip t