patch to avoid sdist-generated MANIFEST files

[Tarek Ziadé]

On Mon, Aug 2, 2010 at 5:44 PM, Matt Mackall <mpm at selenic.com> wrote:
> On Sun, 2010-08-01 at 23:18 +0200, Tarek Ziadé wrote:
>> Hello,
>>
>> Here's a patch that will ensure that distutils sdist command will
>> never try to create a MANIFEST file, since the Mercurial project has
>> its own for this one.
>>
>> It's a dumb patch but it'll works for python 2.4 to python 2.7 until
>> we provide a more suitable --no-manifest option in distutils
>>
>> see: http://bugs.python.org/issue8688
>>
>> Let me know if this works in your process, I'll hang on this list for that
>
> Hmm, still fails with 2.6:
>
> warning: hgsdist: manifest template 'MANIFEST.in' does not exist (using
> default file list)
>
> My release script runs 'make dist', extracts the resulting tarball, then
> builds it to make sure everything worked. With 2.5, it succeeds, with
> 2.6 it fails to build due to util.h not making it into the tarball.

mmm, I do have util.h listed in mine..

$ hg manifest > MANIFEST
$ python2.6 setup.py -q sdist
$ tar -tf dist/m*.tar.gz|grep -ri "util.h"
mercurial-1.6.1+3-b6f72d8d77ae+20100805/mercurial/util.h
$ cd dist/m*
$ python setup.py build
works

I've changed the patch to avoid the warning though.

Cheers
Tarek


> $ diff -u <(hg manifest) <(tar tf mercurial-1.6.2.tar.gz | sed
> 's/mercurial-1.6.2\///') | diffstat
>  62 | 1057
> ---------------------------------------------------------------------
>  1 file changed, 11 insertions(+), 1046 deletions(-)

It's hard to be sure here, since in your makefile you also include
manually other stuff:

MANIFEST: MANIFEST-doc
>.......hg manifest > MANIFEST
>.......echo mercurial/__version__.py >> MANIFEST
>.......cat doc/MANIFEST >> MANIFEST


Cheers
Tarek

>
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
>



-- 
Tarek Ziadé | http://ziade.org