From: Brian Warner Date: Thu, 31 Jan 2008 20:52:48 +0000 (-0700) Subject: tarballs: stick with setup.py's sdist command, which gives us bz2/gz/zip but not... X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/rgr-080307.php?a=commitdiff_plain;h=bf25a041f32277863673b180f51e58716caf92e6;p=tahoe-lafs%2Ftahoe-lafs.git tarballs: stick with setup.py's sdist command, which gives us bz2/gz/zip but not rz/7z/lrz. Closes #298. --- diff --git a/Makefile b/Makefile index 4d04b3ff..143e0757 100644 --- a/Makefile +++ b/Makefile @@ -318,9 +318,8 @@ find-trailing-spaces: # TARBALL GENERATION .PHONY: tarballs tarballs: - $(PYTHON) setup.py sdist - chmod +x misc/make-tarballs.sh - V=$(VER) ./misc/make-tarballs.sh + $(MAKE) make-version + $(PYTHON) setup.py sdist --formats=bztar,gztar,zip # DEBIAN PACKAGING diff --git a/misc/make-tarballs.sh b/misc/make-tarballs.sh deleted file mode 100644 index 82bad37c..00000000 --- a/misc/make-tarballs.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e - -# this is called (with e.g. V=0.7.0-175) after a 'setup.py sdist' has been -# executed, so there will be a dist/allmydata-tahoe-${VER}.tar.gz present. - -echo "creating tarballs for tahoe version '${V}'" - -# we leave the original .tar.gz in place, put a decompressed copy in .tar, -# and then compress it with a number of other compressors. -gunzip -c -d dist/allmydata-tahoe-${V}.tar.gz >dist/allmydata-tahoe-${V}.tar - -bzip2 -k dist/allmydata-tahoe-${V}.tar - -# rzip comes from the 'rzip' package -rzip -k -9 dist/allmydata-tahoe-${V}.tar - -# 7z comes from the 'p7zip-full' package -7z a dist/allmydata-tahoe-${V}.tar.7z dist/allmydata-tahoe-${V}.tar - -# lrzip is destructive (no -k option) -# it is disabled because I cannot find a debian package for it. zooko, where -# did you find this thing? -#lrzip -M dist/allmydata-tahoe-${V}.tar -# since we disabled lrzip, we should remove the .tar file -rm dist/allmydata-tahoe-${V}.tar - -#time rsync --partial --progress allmydata-tahoe-${V}.tar.* zooko@allmydata.org:/var/www/source/tahoe/ -