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

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Yuya Nishihara - - Load All Authors

File last commit:

r27230:9f8b8c4e default


                r31225:749b057b

default

Download file

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

        Mads Kiilerich
    
contrib: offer Python 2.7.10

              r26735
            
      PYTHONVER=2.7.10

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      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:'

        Mads Kiilerich
    
contrib: offer Python 2.7.10

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

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

      	@echo '  Python 2.7'

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      	@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:'

        Mads Kiilerich
    
contrib: offer Python 2.7.10

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

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      	@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

        Mads Kiilerich
    
contrib: drop Python < 2.6 from Makefile.python

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

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      PYTHON_SRCDIR=Python-$(PYTHONVER)

      PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

      $(PREFIX)/bin/python:

        Augie Fackler
    
Makefile.python: try curl if wget fails...

              r23824
            
      	[ -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) ]

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      	rm -rf $(PYTHON_SRCDIR)

      	tar xf $(PYTHON_SRCFILE)

        Yuya Nishihara
    
contrib: disable SSLv3_method() to build old Python with recent libssl...

              r27230
            
      	# 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

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      	# 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

        Mads Kiilerich
    
contrib: drop Python < 2.6 from Makefile.python

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

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      	rm -rf $(PYTHON_SRCDIR)

        Mads Kiilerich
    
contrib: update build defaults to latest Python and docutils versions...

              r23140
            
      DOCUTILSVER=0.12

        Mads Kiilerich
    
contrib/Makefile.python: build local Python from source...

              r20388
            
      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

Mads Kiilerich contrib: offer Python 2.7.10	r26735	PYTHONVER=2.7.10
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	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:'
Mads Kiilerich contrib: offer Python 2.7.10	r26735	@echo ' $$ make -f Makefile.python python PYTHONVER=${PYTHONVER} PREFIX=/tmp/p27'
		@echo ' $$ /tmp/p27/bin/python -V'
		@echo ' Python 2.7'
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	@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:'
Mads Kiilerich contrib: offer Python 2.7.10	r26735	@echo ' $$ for v in 2.{6{,.1,.2,.9},7{,.8,.10}}; do'
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	@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
Mads Kiilerich contrib: drop Python < 2.6 from Makefile.python	r26734	printf 'import sys, zlib, bz2, docutils, ssl' \| $(PREFIX)/bin/python
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388
		PYTHON_SRCDIR=Python-$(PYTHONVER)
		PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz

		$(PREFIX)/bin/python:
Augie Fackler Makefile.python: try curl if wget fails...	r23824	[ -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) ]
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	rm -rf $(PYTHON_SRCDIR)
		tar xf $(PYTHON_SRCFILE)
Yuya Nishihara contrib: disable SSLv3_method() to build old Python with recent libssl...	r27230	# 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
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	# 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
Mads Kiilerich contrib: drop Python < 2.6 from Makefile.python	r26734	printf 'import sys, zlib, bz2, ssl' \| $(PREFIX)/bin/python
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	rm -rf $(PYTHON_SRCDIR)

Mads Kiilerich contrib: update build defaults to latest Python and docutils versions...	r23140	DOCUTILSVER=0.12
Mads Kiilerich contrib/Makefile.python: build local Python from source...	r20388	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