upstream/mercurial-mirror Files · contrib/Makefile.python

changegroup: cg3 has two empty groups *after* manifests...

changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

Yuya Nishihara - - Load All Authors

File last commit:

r27230:9f8b8c4e default


                r27920:da5f2336

stable

Download file

             Makefile.python
        
                    76 lines
            
             | 3.1 KiB
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / contrib / Makefile.python
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      PYTHONVER=2.7.10

      PYTHONNAME=python-

      PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)

      SYMLINKDIR=$(HOME)/bin

      help:

      	@echo

      	@echo 'Make a custom installation of a Python version'

      	@echo

      	@echo 'Common make parameters:'

      	@echo '  PYTHONVER=...    [$(PYTHONVER)]'

      	@echo '  PREFIX=...       [$(PREFIX)]'

      	@echo '  SYMLINKDIR=...   [$(SYMLINKDIR) creating $(PYTHONNAME)$(PYTHONVER)]'

      	@echo

      	@echo 'Common make targets:'

      	@echo '  python    - install Python $$PYTHONVER in $$PREFIX'

      	@echo '  symlink   - create a $$SYMLINKDIR/$(PYTHONNAME)$$PYTHONVER symlink'

      	@echo

      	@echo 'Example: create a temporary Python installation:'

      	@echo '  $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'

      	@echo '  $$ /tmp/p27/bin/python -V'

      	@echo '  Python 2.7'

      	@echo

      	@echo 'Some external libraries are required for building Python: zlib bzip2 openssl.'

      	@echo 'Make sure their development packages are installed systemwide.'

      # fedora: yum install zlib-devel bzip2-devel openssl-devel

      # debian: apt-get install zlib1g-dev libbz2-dev libssl-dev

      	@echo

      	@echo 'To build a nice collection of interesting Python versions:'

      	@echo '  $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'

      	@echo '    make -f Makefile.python symlink PYTHONVER=$$v || break; done'

      	@echo 'To run a Mercurial test on all these Python versions:'

      	@echo '  $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'

      	@echo '    echo $$py; $$py run-tests.py test-http.t; echo; done'

      	@echo

      export LANGUAGE=C

      export LC_ALL=C

      python: $(PREFIX)/bin/python docutils

      	printf 'import sys, zlib, bz2, docutils, ssl' | $(PREFIX)/bin/python

      PYTHON_SRCDIR=Python-$(PYTHONVER)

      PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

      $(PREFIX)/bin/python:

      	[ -f $(PYTHON_SRCFILE) ] || wget http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || curl -OL http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) || [ -f $(PYTHON_SRCFILE) ]

      	rm -rf $(PYTHON_SRCDIR)

      	tar xf $(PYTHON_SRCFILE)

      	# Debian/Ubuntu disables SSLv2,3 the hard way, disable it on old Pythons too

      	-sed -i 's,self.*SSLv[23]_method(),0;//\0,g' $(PYTHON_SRCDIR)/Modules/_ssl.c

      	# Find multiarch system libraries on Ubuntu and disable fortify error when setting argv

      	LDFLAGS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"; \

      	BASECFLAGS=-U_FORTIFY_SOURCE; \

      	export LDFLAGS BASECFLAGS; \

      	cd $(PYTHON_SRCDIR) && ./configure --prefix=$(PREFIX) && make all SVNVERSION=pwd && make install

      	printf 'import sys, zlib, bz2, ssl' | $(PREFIX)/bin/python

      	rm -rf $(PYTHON_SRCDIR)

      DOCUTILSVER=0.12

      DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)

      DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz

      docutils: $(PREFIX)/bin/python

      	@$(PREFIX)/bin/python -c 'import docutils' || ( set -ex; \

      	[ -f $(DOCUTILS_SRCFILE) ] || wget http://downloads.sourceforge.net/project/docutils/docutils/$(DOCUTILSVER)/$(DOCUTILS_SRCFILE) || [ -f $(DOCUTILS_SRCFILE) ]; \

      	rm -rf $(DOCUTILS_SRCDIR); \

      	tar xf $(DOCUTILS_SRCFILE); \

      	cd $(DOCUTILS_SRCDIR) && $(PREFIX)/bin/python setup.py install --prefix=$(PREFIX); \

      	$(PREFIX)/bin/python -c 'import docutils'; \

      	rm -rf $(DOCUTILS_SRCDIR); )

      symlink: python $(SYMLINKDIR)

      	ln -sf $(PREFIX)/bin/python $(SYMLINKDIR)/$(PYTHONNAME)$(PYTHONVER)

      .PHONY: help python docutils symlink

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				PYTHONVER=2.7.10
				PYTHONNAME=python-
				PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
				SYMLINKDIR=$(HOME)/bin

				help:
				@echo
				@echo 'Make a custom installation of a Python version'
				@echo
				@echo 'Common make parameters:'
				@echo ' PYTHONVER=... [$(PYTHONVER)]'
				@echo ' PREFIX=... [$(PREFIX)]'
				@echo ' SYMLINKDIR=... [$(SYMLINKDIR) creating $(PYTHONNAME)$(PYTHONVER)]'
				@echo
				@echo 'Common make targets:'
				@echo ' python - install Python $$PYTHONVER in $$PREFIX'
				@echo ' symlink - create a $$SYMLINKDIR/$(PYTHONNAME)$$PYTHONVER symlink'
				@echo
				@echo 'Example: create a temporary Python installation:'
				@echo ' $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'
				@echo ' $$ /tmp/p27/bin/python -V'
				@echo ' Python 2.7'
				@echo
				@echo 'Some external libraries are required for building Python: zlib bzip2 openssl.'
				@echo 'Make sure their development packages are installed systemwide.'
				# fedora: yum install zlib-devel bzip2-devel openssl-devel
				# debian: apt-get install zlib1g-dev libbz2-dev libssl-dev
				@echo
				@echo 'To build a nice collection of interesting Python versions:'
				@echo ' $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'
				@echo ' make -f Makefile.python symlink PYTHONVER=$$v \|\| break; done'
				@echo 'To run a Mercurial test on all these Python versions:'
				@echo ' $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'
				@echo ' echo $$py; $$py run-tests.py test-http.t; echo; done'
				@echo

				export LANGUAGE=C
				export LC_ALL=C

				python: $(PREFIX)/bin/python docutils
				printf 'import sys, zlib, bz2, docutils, ssl' \| $(PREFIX)/bin/python

				PYTHON_SRCDIR=Python-$(PYTHONVER)
				PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

				$(PREFIX)/bin/python:
				[ -f $(PYTHON_SRCFILE) ] \|\| wget http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) \|\| curl -OL http://www.python.org/ftp/python/$(PYTHONVER)/$(PYTHON_SRCFILE) \|\| [ -f $(PYTHON_SRCFILE) ]
				rm -rf $(PYTHON_SRCDIR)
				tar xf $(PYTHON_SRCFILE)
				# Debian/Ubuntu disables SSLv2,3 the hard way, disable it on old Pythons too
				-sed -i 's,self.*SSLv[23]_method(),0;//\0,g' $(PYTHON_SRCDIR)/Modules/_ssl.c
				# Find multiarch system libraries on Ubuntu and disable fortify error when setting argv
				LDFLAGS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"; \
				BASECFLAGS=-U_FORTIFY_SOURCE; \
				export LDFLAGS BASECFLAGS; \
				cd $(PYTHON_SRCDIR) && ./configure --prefix=$(PREFIX) && make all SVNVERSION=pwd && make install
				printf 'import sys, zlib, bz2, ssl' \| $(PREFIX)/bin/python
				rm -rf $(PYTHON_SRCDIR)

				DOCUTILSVER=0.12
				DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)
				DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz

				docutils: $(PREFIX)/bin/python
				@$(PREFIX)/bin/python -c 'import docutils' \|\| ( set -ex; \
				[ -f $(DOCUTILS_SRCFILE) ] \|\| wget http://downloads.sourceforge.net/project/docutils/docutils/$(DOCUTILSVER)/$(DOCUTILS_SRCFILE) \|\| [ -f $(DOCUTILS_SRCFILE) ]; \
				rm -rf $(DOCUTILS_SRCDIR); \
				tar xf $(DOCUTILS_SRCFILE); \
				cd $(DOCUTILS_SRCDIR) && $(PREFIX)/bin/python setup.py install --prefix=$(PREFIX); \
				$(PREFIX)/bin/python -c 'import docutils'; \
				rm -rf $(DOCUTILS_SRCDIR); )

				symlink: python $(SYMLINKDIR)
				ln -sf $(PREFIX)/bin/python $(SYMLINKDIR)/$(PYTHONNAME)$(PYTHONVER)

				.PHONY: help python docutils symlink