[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r1045: update bzr to 2.6b2
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r1045: update bzr to 2.6b2 |
|
Date: |
Sun, 04 Nov 2012 13:36:05 +0100 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 1045
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-04 13:36:05 +0100
message:
update bzr to 2.6b2
removed:
gnu/bazaar/files/bzr-2.5.1-configure.tar.gz
added:
gnu/bazaar/files/bzr-2.6b2/
gnu/bazaar/files/bzr-2.6b2-configure.tar.gz
gnu/bazaar/files/bzr-2.6b2/Makefile.in
gnu/bazaar/files/bzr-2.6b2/configure.ac
gnu/bazaar/files/bzr-2.6b2/m4/
gnu/bazaar/files/bzr-2.6b2/m4/python.m4
modified:
gnu/bazaar/Makefile
gnu/bazaar/config.mk
gnu/bazaar/sha256sums
=== modified file 'gnu/bazaar/Makefile'
--- a/gnu/bazaar/Makefile 2012-10-27 23:43:13 +0000
+++ b/gnu/bazaar/Makefile 2012-11-04 12:36:05 +0000
@@ -1,17 +1,19 @@
GARNAME = bzr
-GARVERSION = 2.5.1
+GARVERSION = 2.6
+RELEASE = b2
HOME_URL = http://bazaar.canonical.com
DESCRIPTION = The GNU distributed version control system
######################################################################
+DISTNAME = $(GARNAME)-$(GARVERSION)$(RELEASE)
empty:=
space:= $(empty) $(empty)
VERSION_LIST = $(subst .,$(space),$(GARVERSION))
SERIES = $(subst $(space),.,$(wordlist 1,2,$(VERSION_LIST)))
MASTER_SITES = https://launchpad.net/bzr/
-MASTER_SUBDIR = $(SERIES)/$(GARVERSION)/+download
+MASTER_SUBDIR = $(SERIES)/$(GARVERSION)$(RELEASE)/+download/
DISTFILES = $(DISTNAME).tar.gz $(DISTNAME)-configure.tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
=== modified file 'gnu/bazaar/config.mk'
--- a/gnu/bazaar/config.mk 2012-10-27 23:43:13 +0000
+++ b/gnu/bazaar/config.mk 2012-11-04 12:36:05 +0000
@@ -1,4 +1,4 @@
## Configuration options for bazaar ##
-CONFIGURE_OPTS ?=
+CONFIGURE_OPTS ?= PYTHON=/usr/bin/python2
BUILD_OPTS ?=
=== removed file 'gnu/bazaar/files/bzr-2.5.1-configure.tar.gz'
Binary files a/gnu/bazaar/files/bzr-2.5.1-configure.tar.gz 2012-09-22
14:11:12 +0000 and b/gnu/bazaar/files/bzr-2.5.1-configure.tar.gz 1970-01-01
00:00:00 +0000 differ
=== added directory 'gnu/bazaar/files/bzr-2.6b2'
=== added file 'gnu/bazaar/files/bzr-2.6b2-configure.tar.gz'
Binary files a/gnu/bazaar/files/bzr-2.6b2-configure.tar.gz 1970-01-01
00:00:00 +0000 and b/gnu/bazaar/files/bzr-2.6b2-configure.tar.gz 2012-11-04
12:36:05 +0000 differ
=== added file 'gnu/bazaar/files/bzr-2.6b2/Makefile.in'
--- a/gnu/bazaar/files/bzr-2.6b2/Makefile.in 1970-01-01 00:00:00 +0000
+++ b/gnu/bazaar/files/bzr-2.6b2/Makefile.in 2012-11-04 12:36:05 +0000
@@ -0,0 +1,550 @@
+# Copyright (C) 2005-2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# A relatively simple Makefile to assist in building parts of bzr. Mostly for
+# building documentation, etc.
+
+### Core Stuff ###
+
+
+VPATH = @srcdir@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PYTHON = @PYTHON@
+PYTHON24 = python24
+PYTHON25 = python25
+PYTHON26 = python26
+HAVE_PYTHON_H = @HAVE_PYTHON_H@
+HAVE_PYREX = @HAVE_PYREX@
+SHELL = @SHELL@
+
+BZR_TARGET=release
+PLUGIN_TARGET=plugin-release
+
+bindir = @bindir@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+mandir = @mandir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgdatadir = $(datadir)/@PACKAGE_NAME@
+pkgincludedir = $(includedir)/@PACKAGE_NAME@
+pkgpythondir = @pkgpythondir@
+pkgpyexecdir = @pkgpyexecdir@
+PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir)
+
+
+
+
+.PHONY: all clean realclean extensions pyflakes api-docs check-nodocs check
install uninstall distclean
+
+all: extensions
+
+extensions:
+ifeq ($(HAVE_PYTHON_H),yes)
+ifeq ($(HAVE_PYREX),yes)
+ @echo "building extension modules."
+ $(PYTHON) $(srcdir)/setup.py build_ext -i $(PYTHON_BUILDFLAGS)
+endif
+endif
+
+install:
+ $(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+
+uninstall:
+ rm -rf $(DESTDIR)$(pkgpythondir)
+ rm $(DESTDIR)$(bindir)/bzr
+ rm $(DESTDIR)$(mandir)/man1/bzr.1
+
+distclean:
+ rm $(srcdir)/config.log
+ rm $(srcdir)/config.status
+
+
+check: docs check-nodocs
+ $(PYTHON) $(srcdir)/setup.py check
+
+
+# Generate a stream for PQM to watch.
+# An empty log file should catch errors in the $(PYTHON)
+# command above (the '|' swallow any errors since 'make'
+# sees the 'tee' exit code for the whole line
+# Check that there were no errors reported.
+check-nodocs: extensions
+ set -e
+ -$(RM) -f selftest.log
+ echo `date` ": selftest starts" 1>&2
+ $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest
-Oselftest.timeout=120 \
+ --subunit $(tests) | tee selftest.log
+ echo `date` ": selftest ends" 1>&2
+ if [ ! -s selftest.log ] ; then exit 1 ; fi
+ subunit-stats < selftest.log
+
+
+# Run Python style checker (apt-get install pyflakes)
+#
+# Note that at present this gives many false warnings, because it doesn't
+# know about identifiers loaded through lazy_import.
+pyflakes:
+ pyflakes bzrlib
+
+
+# There are many of these warnings at the moment and they're not a
+# high priority to fix
+pyflakes-nounused:
+ pyflakes bzrlib | grep -v ' imported but unused'
+
+
+clean:
+ $(PYTHON) setup.py clean
+ -find . -name "*.pyc" -o -name "*.pyo" -o -name "*.so" | xargs rm -f
+
+
+# Remove files which are autogenerated but included by the tarball.
+realclean: clean
+ rm -f bzrlib/*_pyx.c
+ rm -f bzrlib/_simple_set_pyx.h bzrlib/_simple_set_pyx_api.h
+
+
+# Build API documentation
+docfiles = bzr bzrlib
+api-docs:
+ mkdir -p api/html
+ pydoctor --make-html --docformat='restructuredtext'
--html-output=api/html $(docfiles)
+
+
+# build tags for emacs and vim
+TAGS:
+ ctags -R -e bzrlib
+
+tags:
+ ctags -R bzrlib
+
+
+# these are treated as phony so they'll always be rebuilt - it's pretty quick
+.PHONY: TAGS tags
+
+
+### Documentation ###
+
+# Default to plain documentation for maximum backwards compatibility.
+# (Post 2.0, the defaults will most likely be Sphinx-style instead.)
+
+docs: docs-plain
+
+clean-docs: clean-plain
+
+html-docs: html-plain
+
+
+### Man-page Documentation ###
+
+MAN_DEPENDENCIES = bzrlib/builtins.py \
+ $(wildcard bzrlib/*.py) \
+ $(wildcard bzrlib/*/*.py) \
+ tools/generate_docs.py \
+ $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en))
+
+MAN_PAGES = man1/bzr.1
+man1/bzr.1: $(MAN_DEPENDENCIES)
+ $(PYTHON) tools/generate_docs.py -o $@ man
+
+
+### Sphinx-style Documentation ###
+
+# Build the documentation. To keep the dependencies down to a minimum
+# for distro packagers, we only build the html documentation by default.
+# Sphinx 0.6 or later is preferred for the best rendering, though
+# Sphinx 0.4 or later should work. See http://sphinx.pocoo.org/index.html
+# for installation instructions.
+docs-sphinx: html-sphinx
+
+# Clean out generated documentation
+clean-sphinx:
+ cd doc/en && make clean
+ cd doc/es && make clean
+ cd doc/ja && make clean
+ cd doc/ru && make clean
+ cd doc/developers && make clean
+
+SPHINX_DEPENDENCIES = \
+ doc/en/release-notes/index.txt \
+ doc/en/user-reference/index.txt \
+ doc/es/Makefile \
+ doc/es/make.bat \
+ doc/ja/Makefile \
+ doc/ja/make.bat \
+ doc/ru/Makefile \
+ doc/ru/make.bat \
+ doc/developers/Makefile \
+ doc/developers/make.bat
+
+NEWS_FILES = $(wildcard doc/en/release-notes/bzr-*.txt)
+
+doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)
+ $(PYTHON) tools/generate_docs.py -o $@ rstx
+
+doc/en/release-notes/index.txt: $(NEWS_FILES) tools/generate_release_notes.py
+ $(PYTHON) tools/generate_release_notes.py $@ $(NEWS_FILES)
+
+doc/%/Makefile: doc/en/Makefile
+ $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
+
+doc/%/make.bat: doc/en/make.bat
+ $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
+
+# Build the html docs using Sphinx.
+html-sphinx: $(SPHINX_DEPENDENCIES)
+ cd doc/en && make html
+ cd doc/es && make html
+ cd doc/ru && make html
+ cd doc/ja && make html
+ cd doc/developers && make html
+
+# Build the PDF docs using Sphinx. This requires numerous LaTeX
+# packages. See http://sphinx.pocoo.org/builders.html for details.
+# Note: We don't currently build PDFs for the Russian docs because
+# they require additional packages to be installed (to handle
+# Russian hyphenation rules, etc.)
+pdf-sphinx: $(SPHINX_DEPENDENCIES)
+ cd doc/en && make latex
+ cd doc/es && make latex
+ cd doc/ja && make latex
+ cd doc/developers && make latex
+ cd doc/en/_build/latex && make all-pdf
+ cd doc/es/_build/latex && make all-pdf
+ cd doc/developers/_build/latex && make all-pdf
+
+# Build the CHM (Windows Help) docs using Sphinx.
+# Note: HtmlHelp Workshop needs to be used on the generated hhp files
+# to generate the final chm files.
+chm-sphinx: $(SPHINX_DEPENDENCIES)
+ cd doc/en && make htmlhelp
+ cd doc/es && make htmlhelp
+ cd doc/ru && make htmlhelp
+ cd doc/ja && make htmlhelp
+ cd doc/developers && make htmlhelp
+
+
+# Build the texinfo files using Sphinx.
+texinfo-sphinx: $(SPHINX_DEPENDENCIES)
+ cd doc/en && make texinfo
+ cd doc/es && make texinfo
+ cd doc/ru && make texinfo
+ cd doc/ja && make texinfo
+ cd doc/developers && make texinfo
+
+### Documentation Website ###
+
+# Where to build the website
+DOC_WEBSITE_BUILD = build_doc_website
+
+# Build and package docs into a website, complete with downloads.
+doc-website: html-sphinx pdf-sphinx
+ $(PYTHON) tools/package_docs.py doc/en $(DOC_WEBSITE_BUILD)
+ $(PYTHON) tools/package_docs.py doc/es $(DOC_WEBSITE_BUILD)
+ $(PYTHON) tools/package_docs.py doc/ru $(DOC_WEBSITE_BUILD)
+ $(PYTHON) tools/package_docs.py doc/ja $(DOC_WEBSITE_BUILD)
+ $(PYTHON) tools/package_docs.py doc/developers $(DOC_WEBSITE_BUILD)
+
+
+### Plain Documentation ###
+
+# While Sphinx is the preferred tool for building documentation, we still
+# support our "plain" html documentation so that Sphinx is not a hard
+# dependency for packagers on older platforms.
+
+rst2html = $(PYTHON) tools/rst2html.py --link-stylesheet
--footnote-references=superscript --halt=warning
+
+# translate txt docs to html
+derived_txt_files = \
+ doc/en/release-notes/NEWS.txt
+txt_all = \
+ doc/en/tutorials/tutorial.txt \
+ doc/en/tutorials/using_bazaar_with_launchpad.txt \
+ doc/en/tutorials/centralized_workflow.txt \
+ $(wildcard doc/es/tutorials/*.txt) \
+ $(wildcard doc/ru/tutorials/*.txt) \
+ doc/ja/tutorials/tutorial.txt \
+ doc/ja/tutorials/using_bazaar_with_launchpad.txt \
+ doc/ja/tutorials/centralized_workflow.txt \
+ $(wildcard doc/*/mini-tutorial/index.txt) \
+ $(wildcard doc/*/user-guide/index-plain.txt) \
+ doc/en/admin-guide/index-plain.txt \
+ $(wildcard doc/es/guia-usario/*.txt) \
+ $(derived_txt_files) \
+ doc/en/upgrade-guide/index.txt \
+ doc/index.txt \
+ $(wildcard doc/index.*.txt)
+txt_nohtml = \
+ doc/en/user-guide/index.txt \
+ doc/es/user-guide/index.txt \
+ doc/ja/user-guide/index.txt \
+ doc/ru/user-guide/index.txt \
+ doc/en/admin-guide/index.txt
+txt_files = $(filter-out $(txt_nohtml), $(txt_all))
+htm_files = $(patsubst %.txt, %.html, $(txt_files))
+
+non_txt_files = \
+ doc/default.css \
+ $(wildcard doc/*/bzr-en-quick-reference.svg) \
+ $(wildcard doc/*/bzr-en-quick-reference.png) \
+ $(wildcard doc/*/bzr-en-quick-reference.pdf) \
+ $(wildcard doc/*/bzr-es-quick-reference.svg) \
+ $(wildcard doc/*/bzr-es-quick-reference.png) \
+ $(wildcard doc/*/bzr-es-quick-reference.pdf) \
+ $(wildcard doc/*/bzr-ru-quick-reference.svg) \
+ $(wildcard doc/*/bzr-ru-quick-reference.png) \
+ $(wildcard doc/*/bzr-ru-quick-reference.pdf) \
+ $(wildcard doc/*/user-guide/images/*.png)
+
+# doc/developers/*.txt files that should *not* be individually
+# converted to HTML
+dev_txt_nohtml = \
+ doc/developers/add.txt \
+ doc/developers/annotate.txt \
+ doc/developers/bundle-creation.txt \
+ doc/developers/commit.txt \
+ doc/developers/diff.txt \
+ doc/developers/directory-fingerprints.txt \
+ doc/developers/gc.txt \
+ doc/developers/implementation-notes.txt \
+ doc/developers/incremental-push-pull.txt \
+ doc/developers/index.txt \
+ doc/developers/initial-push-pull.txt \
+ doc/developers/merge-scaling.txt \
+ doc/developers/miscellaneous-notes.txt \
+ doc/developers/missing.txt \
+ doc/developers/performance-roadmap-rationale.txt \
+ doc/developers/performance-use-case-analysis.txt \
+ doc/developers/planned-change-integration.txt \
+ doc/developers/planned-performance-changes.txt \
+ doc/developers/plans.txt \
+ doc/developers/process.txt \
+ doc/developers/revert.txt \
+ doc/developers/specifications.txt \
+ doc/developers/status.txt \
+ doc/developers/uncommit.txt
+
+dev_txt_all = $(wildcard $(addsuffix /*.txt, doc/developers))
+dev_txt_files = $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
+dev_htm_files = $(patsubst %.txt, %.html, $(dev_txt_files))
+
+doc/en/user-guide/index-plain.html: $(wildcard $(addsuffix /*.txt,
doc/en/user-guide))
+ $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
+
+#doc/es/user-guide/index.html: $(wildcard $(addsuffix /*.txt,
doc/es/user-guide))
+# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
+#
+#doc/ru/user-guide/index.html: $(wildcard $(addsuffix /*.txt,
doc/ru/user-guide))
+# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
+#
+doc/en/admin-guide/index-plain.html: $(wildcard $(addsuffix /*.txt,
doc/en/admin-guide))
+ $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
+
+doc/developers/%.html: doc/developers/%.txt
+ $(rst2html) --stylesheet=../default.css $< $@
+
+doc/index.html: doc/index.txt
+ $(rst2html) --stylesheet=default.css $< $@
+
+doc/index.%.html: doc/index.%.txt
+ $(rst2html) --stylesheet=default.css $< $@
+
+%.html: %.txt
+ $(rst2html) --stylesheet=../../default.css $< "$@"
+
+doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py
+ $(PYTHON) tools/generate_release_notes.py "$@" $(NEWS_FILES)
+
+upgrade_guide_dependencies = $(wildcard $(addsuffix /*.txt,
doc/en/upgrade-guide))
+
+doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)
+ $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
+
+derived_web_docs = $(htm_files) $(dev_htm_files)
+WEB_DOCS = $(derived_web_docs) $(non_txt_files)
+ALL_DOCS = $(derived_web_docs) $(MAN_PAGES)
+
+# the main target to build all the docs
+docs-plain: $(ALL_DOCS)
+
+# produce a tree containing just the final docs, ready for uploading to the web
+HTMLDIR = html_docs
+html-plain: docs-plain
+ $(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) $(HTMLDIR)
+
+# clean produced docs
+clean-plain:
+ $(PYTHON) tools/win32/ostools.py remove $(ALL_DOCS) \
+ $(HTMLDIR) $(derived_txt_files)
+
+
+### Miscellaneous Documentation Targets ###
+
+# build a png of our performance task list
+# this is no longer built by default; you can build it if you want to look at
it
+doc/developers/performance.png: doc/developers/performance.dot
+ @echo Generating $@
+ @dot -Tpng $< -o$@ || echo "Dot not installed; skipping generation of
$@"
+
+
+### Windows Support ###
+
+# make all the installers completely from scratch, using zc.buildout
+# to fetch the dependencies
+# These are files that need to be copied into the build location to boostrap
+# the build process.
+# Note that the path is relative to tools/win32
+BUILDOUT_FILES = buildout.cfg \
+ buildout-templates/bin/build-installer.bat.in \
+ ostools.py bootstrap.py
+
+installer-all:
+ @echo Make all the installers from scratch
+ @# Build everything in a separate directory, to avoid cluttering the WT
+ $(PYTHON) tools/win32/ostools.py makedir build-win32
+ @# cd to tools/win32 so that the relative paths are copied correctly
+ cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES)
../../build-win32
+ @# There seems to be a bug in gf.release.bzr, It doesn't correctly
update
+ @# existing release directories, so delete them manually before building
+ @# It means things may be rebuilt that don't need to be, but at least
+ @# it will be correct when they do.
+ cd build-win32 && $(PYTHON) ostools.py remove release */release
+ cd build-win32 && $(PYTHON) bootstrap.py
+ cd build-win32 && bin/buildout
+ cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
+
+
+clean-installer-all:
+ $(PYTHON) tools/win32/ostools.py remove build-win32
+
+# make bzr.exe for win32 with py2exe
+exe:
+ @echo *** Make bzr.exe
+ $(PYTHON) tools/win32/ostools.py remove bzrlib/*.pyd
+ $(PYTHON) setup.py build_ext -i -f $(PYTHON_BUILDFLAGS)
+ $(PYTHON) setup.py py2exe > py2exe.log
+ $(PYTHON) tools/win32/ostools.py copytodir tools/win32/start_bzr.bat
win32_bzr.exe
+ $(PYTHON) tools/win32/ostools.py copytodir tools/win32/bazaar.url
win32_bzr.exe
+
+# win32 installer for bzr.exe
+installer: exe copy-docs
+ @echo *** Make Windows installer
+ $(PYTHON) tools/win32/run_script.py cog.py -d -o tools/win32/bzr.iss
tools/win32/bzr.iss.cog
+ iscc /Q tools/win32/bzr.iss
+
+# win32 Python's distutils-based installer
+# require to have Python interpreter installed on win32
+py-inst-24: docs
+ $(PYTHON24) setup.py bdist_wininst
--install-script="bzr-win32-bdist-postinstall.py" -d .
+
+py-inst-25: docs
+ $(PYTHON25) setup.py bdist_wininst
--install-script="bzr-win32-bdist-postinstall.py" -d .
+
+py-inst-26: docs
+ $(PYTHON26) setup.py bdist_wininst
--install-script="bzr-win32-bdist-postinstall.py" -d .
+
+python-installer: py-inst-24 py-inst-25 py-inst-26
+
+
+copy-docs: docs
+ $(PYTHON) tools/win32/ostools.py copytodir README win32_bzr.exe/doc
+ $(PYTHON) tools/win32/ostools.py copytree $(WEB_DOCS) win32_bzr.exe
+
+# clean on win32 all installer-related files and directories
+clean-win32: clean-docs
+ $(PYTHON) tools/win32/ostools.py remove build
+ $(PYTHON) tools/win32/ostools.py remove win32_bzr.exe
+ $(PYTHON) tools/win32/ostools.py remove py2exe.log
+ $(PYTHON) tools/win32/ostools.py remove tools/win32/bzr.iss
+ $(PYTHON) tools/win32/ostools.py remove bzr-setup*.exe
+ $(PYTHON) tools/win32/ostools.py remove bzr-*win32.exe
+ $(PYTHON) tools/win32/ostools.py remove dist
+
+
+# i18n targets
+
+.PHONY: update-pot po/bzr.pot
+update-pot: po/bzr.pot
+
+TRANSLATABLE_PYFILES:=$(shell find bzrlib -name '*.py' \
+ | grep -v 'bzrlib/tests/' \
+ | grep -v 'bzrlib/doc' \
+ )
+
+po/bzr.pot: $(PYFILES) $(DOCFILES)
+ $(PYTHON) ./bzr export-pot --include-duplicates > po/bzr.pot
+ echo $(TRANSLATABLE_PYFILES) | xargs \
+ xgettext --package-name "bzr" \
+ --msgid-bugs-address "<address@hidden>" \
+ --copyright-holder "Canonical" \
+ --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
+ -d bzr -p po -o bzr.pot
+
+
+### Packaging Targets ###
+
+.PHONY: dist check-dist-tarball
+
+# build a distribution source tarball
+#
+# this method of copying the pyrex generated files is a bit ugly; it would be
+# nicer to generate it from distutils.
+dist:
+ version=`./bzr version --short` && \
+ echo Building distribution of bzr $$version && \
+ expbasedir=`mktemp -t -d tmp_bzr_dist.XXXXXXXXXX` && \
+ expdir=$$expbasedir/bzr-$$version && \
+ tarball=$$PWD/../bzr-$$version.tar.gz && \
+ $(MAKE) clean && \
+ $(MAKE) && \
+ bzr export $$expdir && \
+ cp bzrlib/*.c bzrlib/*.h $$expdir/bzrlib/. && \
+ tar cfz $$tarball -C $$expbasedir bzr-$$version && \
+ gpg --detach-sign $$tarball && \
+ rm -rf $$expbasedir
+
+# run all tests in a previously built tarball
+check-dist-tarball:
+ tmpdir=`mktemp -t -d tmp_bzr_check_dist.XXXXXXXXXX` && \
+ version=`./bzr version --short` && \
+ tarball=$$PWD/../bzr-$$version.tar.gz && \
+ tar Cxz $$tmpdir -f $$tarball && \
+ $(MAKE) -C $$tmpdir/bzr-$$version check && \
+ rm -rf $$tmpdir
=== added file 'gnu/bazaar/files/bzr-2.6b2/configure.ac'
--- a/gnu/bazaar/files/bzr-2.6b2/configure.ac 1970-01-01 00:00:00 +0000
+++ b/gnu/bazaar/files/bzr-2.6b2/configure.ac 2012-11-04 12:36:05 +0000
@@ -0,0 +1,71 @@
+# Copyright 2012 Brandon Invergo <address@hidden>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+
+# This is a basic Autoconf configure.ac file for Python-based
+# projects. It is not intended to be used as-is, but rather to be
+# modified to the specific needs of the project.
+
+
+# The minimum-required Python versions
+m4_define(python_min_ver, 2.6)
+
+
+# Unless these macros are included upstream somewhere, this must be included
+m4_include([m4/python.m4])
+
+
+# Initialize Autoconf.
+AC_INIT(bzr, 2.6b2,,,)
+
+# Load macros from the m4/ directory
+AC_CONFIG_MACRO_DIR([m4])
+
+# Ensure that srcdir contains setup.py
+AC_CONFIG_SRCDIR(setup.py)
+
+# Here we check if we are using Python 3
+PC_PYTHON_VERIFY_VERSION([$PYTHON], 3.0,
+ py3k=true,
+ py3k=false)
+# If a Python 3 interpreter was found, look specifically for a Python 2 one
+if test "$py3k" = "true" ; then
+ m4_define_default([_PYTHON2_BINS], [python2 python2.7 python2.6])
+ AC_PATH_PROGS(PYTHON, [_PYTHON2_BINS])
+else
+# otherwise check that the Python 2 version is sufficient
+ PC_PYTHON_VERIFY_VERSION([$PYTHON], python_min_ver, ,
+ [AC_MSG_ERROR(Python interpreter too old)])
+fi
+if test -z "$PYTHON"; then
+ AC_MSG_ERROR(No Python 2 interpreter found)
+fi
+
+PC_PYTHON_CHECK_HEADERS(have_python_h=yes, have_python_h=no)
+AC_SUBST([HAVE_PYTHON_H], $have_python_h)
+
+PC_PYTHON_TEST_LIBS([PyObject_Print])
+
+# Add PYTHON_LIBS to LIBS
+LIBS="$LIBS $PYTHON_LIBS"
+
+PC_PYTHON_CHECK_PLATFORM
+
+PC_PYTHON_SITE_PACKAGE_DIR
+PC_PYTHON_EXEC_PACKAGE_DIR
+
+PC_PYTHON_CHECK_MODULE([xml.etree.cElementTree],,
+ [AC_MSG_ERROR(The Python module cElementTree is
required)])
+PC_PYTHON_CHECK_MODULE([paramiko])
+PC_PYTHON_CHECK_MODULE([Cython])
+AC_SUBST([HAVE_CYTHON], [$pc_cv_python_module_Cython])
+PC_PYTHON_CHECK_MODULE([Pyrex])
+AC_SUBST([HAVE_PYREX], [$pc_cv_python_module_Pyrex])
+
+# Files to be configured
+AC_CONFIG_FILES([Makefile])
+# Generate config.status
+AC_OUTPUT
=== added directory 'gnu/bazaar/files/bzr-2.6b2/m4'
=== added file 'gnu/bazaar/files/bzr-2.6b2/m4/python.m4'
--- a/gnu/bazaar/files/bzr-2.6b2/m4/python.m4 1970-01-01 00:00:00 +0000
+++ b/gnu/bazaar/files/bzr-2.6b2/m4/python.m4 2012-11-04 12:36:05 +0000
@@ -0,0 +1,550 @@
+# Copyright 2012 Brandon Invergo <address@hidden>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+
+# Many of these macros were adapted from ones written by Andrew Dalke
+# and James Henstridge and are included with the Automake utility
+# under the following copyright terms:
+#
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Table of Contents:
+#
+# 1. Language selection
+# and routines to produce programs in a given language.
+#
+# 2. Producing programs in a given language.
+#
+# 3. Looking for a compiler
+# And possibly the associated preprocessor.
+#
+# 4. Looking for specific libs & functionality
+
+
+## ----------------------- ##
+## 1. Language selection. ##
+## ----------------------- ##
+
+
+# AC_LANG(Python)
+# ---------------
+AC_LANG_DEFINE([Python], [py], [PY], [PYTHON], [],
+[ac_ext=py
+ac_compile='chmod +x conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+ac_link='chmod +x conftest.$ac_ext && cp conftest.$ac_ext conftest
>&AS_MESSAGE_LOG_FD'
+])
+
+
+# AC_LANG_PYTHON
+# --------------
+AU_DEFUN([AC_LANG_PYTHON], [AC_LANG(Python)])
+
+
+## ----------------------- ##
+## 2. Producing programs. ##
+## ----------------------- ##
+
+
+# AC_LANG_PROGRAM(Python)([PROLOGUE], [BODY])
+# -------------------------------------------
+m4_define([AC_LANG_PROGRAM(Python)], [dnl
address@hidden:@!$PYTHON
+$1
+m4_if([$2], [], [], [dnl
+if __name__ == '__main__':
+$2])])
+
+
+# _AC_LANG_IO_PROGRAM(Python)
+# ---------------------------
+# Produce source that performs I/O.
+m4_define([_AC_LANG_IO_PROGRAM(Python)],
+[AC_LANG_PROGRAM([dnl
+import sys
+try:
+ h = open('conftest.out')
+except:
+ sys.exit(1)
+else:
+ close(h)
+ sys.exit(0)
+], [])])
+
+
+# _AC_LANG_CALL(Python)([PROLOGUE], [FUNCTION])
+# ---------------------
+# Produce source that calls FUNCTION
+m4_define([_AC_LANG_CALL(Python)],
+[AC_LANG_PROGRAM([$1], [$2])])
+
+
+
+## -------------------------------------------- ##
+## 3. Looking for Compilers and Interpreters. ##
+## -------------------------------------------- ##
+
+
+AC_DEFUN([AC_LANG_COMPILER(Python)],
+[AC_REQUIRE([AC_PROG_PYTHON])])
+
+
+# AC_PROG_PYTHON(PROG-TO-CHECK-FOR)
+# ---------------------------------
+# Find a Python interpreter. Python versions prior to 2.0 are not
+# supported. (2.0 was released on October 16, 2000).
+AC_DEFUN([AC_PROG_PYTHON],
+[AC_ARG_VAR([PYTHON], [the Python interpreter])
+m4_define_default([_PC_PYTHON_INTERPRETER_LIST],
+ [python python3 python3.2 python3.1 python3.0 python2
python2.7 dnl
+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1
python2.0])
+m4_ifval([$1],
+ [AC_PATH_PROGS(PYTHON, [$1 _PC_PYTHON_INTERPRETER_LIST])],
+ [AC_PATH_PROGS(PYTHON, [_PC_PYTHON_INTERPRETER_LIST])])
+])
+
+
+# PC_PYTHON_PROG_PYTHON_CONFIG(PROG-TO-CHECK-FOR)
+# ----------------------------------------------
+# Find the python-config program
+AC_DEFUN([PC_PYTHON_PROG_PYTHON_CONFIG],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+AC_ARG_VAR([PYTHON_CONFIG], [the Python-config program])
+m4_define([_PYTHON_BASENAME], [`basename $PYTHON`])
+m4_ifval([$1],
+ [AC_PATH_PROGS(PYTHON_CONFIG, [$1 _PYTHON_BASENAME-config])],
+ [AC_PATH_PROG(PYTHON_CONFIG, _PYTHON_BASENAME-config)])
+]) # PC_PYTHON_PROG_PYTHON_CONFIG
+
+
+# PC_PYTHON_VERIFY_VERSION(PYTHON-PROGRAM, VERSION, [ACTION-IF-TRUE],
[ACTION-IF-NOT-FOUND])
+# ---------------------------------------------------------------------------
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+# Run ACTION-IF-FALSE otherwise.
+# This test uses sys.hexversion instead of the string equivalent (first
+# word of sys.version), in order to cope with versions such as 2.2c1.
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
+AC_DEFUN([PC_PYTHON_VERIFY_VERSION],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+m4_define([pc_python_safe_ver], m4_bpatsubsts($2, [\.], [_]))
+AC_CACHE_CHECK([if Python >= '$2'],
+ [[pc_cv_python_min_version_]pc_python_safe_ver],
+ [AC_LANG_PUSH(Python)[]dnl
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+ # split strings by '.' and convert to numeric. Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+ minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(4)):
+ minverhex = (minverhex << 8) + minver[[i]]
+ sys.exit(sys.hexversion < minverhex)
+])],
+ [[pc_cv_python_min_version_]pc_python_safe_ver="yes"],
+ [[pc_cv_python_min_version_]pc_python_safe_ver="no"])
+ AC_LANG_POP(Python)[]dnl
+ ])
+AS_IF([test "$[pc_cv_python_min_version_]pc_python_safe_ver" = "no"], [$4],
[$3])
+])# PC_PYTHON_VERIFY_VERSION
+
+
+# PC_PYTHON_CHECK_VERSION
+# -----------------------
+# Query Python for its version number. Getting [:3] seems to be
+# the best way to do this; it's what "site.py" does in the standard
+# library.
+AC_DEFUN([PC_PYTHON_CHECK_VERSION],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+AC_CACHE_CHECK([for $1 version],
+ [pc_cv_python_version],
+ [AC_LANG_PUSH(Python)[]dnl
+ AC_LANG_CONFTEST([
+ AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+ sys.stdout.write(sys.version[[:3]])
+])])
+ pc_cv_python_version=`$PYTHON conftest.py`
+ AC_LANG_POP(Python)[]dnl
+ ])
+AC_SUBST([PYTHON_VERSION], [$pc_cv_python_version])
+])# PC_PYTHON_CHECK_VERSION
+
+
+# PC_PYTHON_CHECK_PREFIX
+# ----------------------
+# Use the value of $prefix for the corresponding value of
+# PYTHON_PREFIX. This is made a distinct variable so it can be
+# overridden if need be. However, general consensus is that you
+# shouldn't need this ability.
+AC_DEFUN([PC_PYTHON_CHECK_PREFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python prefix], [pc_cv_python_prefix],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_prefix=`$PYTHON_CONFIG --prefix 2>> AS_MESSAGE_LOG_FD`
+else
+ AC_LANG_PUSH(Python)[]dnl
+ pc_cv_python_prefix=AC_LANG_CONFTEST([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+ sys.exit(sys.prefix)
+])])
+ AC_LANG_POP(Python)[]dnl
+fi])
+AC_SUBST([PYTHON_PREFIX], [$pc_cv_python_prefix])])
+
+
+# PC_PYTHON_CHECK_EXEC_PREFIX
+# --------------------------
+# Like above, but for $exec_prefix
+AC_DEFUN([PC_PYTHON_CHECK_EXEC_PREFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python exec-prefix], [pc_cv_python_exec_prefix],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_exec_prefix=`$PYTHON_CONFIG --exec-prefix 2>>
AS_MESSAGE_LOG_FD`
+else
+ AC_LANG_PUSH(Python)[]dnl
+ pc_cv_python_exec_prefix=AC_LANG_CONFTEST([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+ sys.exit(sys.exec_prefix)
+])])
+ AC_LANG_POP(Python)[]dnl
+fi
+])
+AC_SUBST([PYTHON_EXEC_PREFIX], [$pc_cv_python_exec_prefix])])
+
+
+# PC_PYTHON_CHECK_INCLUDES
+# ------------------------
+# Find the Python header file include flags (ie
+# '-I/usr/include/python')
+AC_DEFUN([PC_PYTHON_CHECK_INCLUDES],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python includes], [pc_cv_python_includes],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_includes=`$PYTHON_CONFIG --includes 2>> AS_MESSAGE_LOG_FD`
+else
+
pc_cv_python_includes="[-I$includedir/$_PYTHON_BASENAME]m4_ifdef(PYTHON_ABI_FLAGS,
+ PYTHON_ABI_FLAGS,)"
+fi
+])
+AC_SUBST([PYTHON_INCLUDES], [$pc_cv_python_includes])])
+
+
+# PC_PYTHON_CHECK_HEADERS([ACTION-IF-PRESENT], [ACTION-IF-ABSENT])
+# -----------------------
+# Check for the presence and usability of Python.h
+AC_DEFUN([PC_PYTHON_CHECK_HEADERS],
+[AC_REQUIRE([PC_PYTHON_CHECK_INCLUDES])[]dnl
+pc_cflags_store=$CPPFLAGS
+CPPFLAGS="$CFLAGS $PYTHON_INCLUDES"
+AC_CHECK_HEADER([Python.h], [$1], [$2])
+CPPFLAGS=$pc_cflags_store
+])
+
+
+# PC_PYTHON_CHECK_LIBS
+# --------------------
+# Find the Python lib flags (ie '-lpython')
+AC_DEFUN([PC_PYTHON_CHECK_LIBS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python libs], [pc_cv_python_libs],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_libs=`$PYTHON_CONFIG --libs 2>> AS_MESSAGE_LOG_FD`
+else
+ pc_cv_python_libs="[-l$_PYTHON_BASENAME]m4_ifdef(PYTHON_ABI_FLAGS,
PYTHON_ABI_FLAGS,)"
+fi
+])
+AC_SUBST([PYTHON_LIBS], [$pc_cv_python_libs])])
+
+
+# PC_PYTHON_TEST_LIBS(LIBRARY-FUNCTION, [ACTION-IF-PRESENT],
[ACTION-IF-ABSENT])
+# -------------------
+# Verify that the Python libs can be loaded
+AC_DEFUN([PC_PYTHON_TEST_LIBS],
+[AC_REQUIRE([PC_PYTHON_CHECK_LIBS])[]dnl
+pc_libflags_store=$LIBS
+for lflag in $PYTHON_LIBS; do
+ case $lflag in
+ -lpython*@:}@
+ LIBS="$LIBS $lflag"
+ pc_libpython=`echo $lflag | sed -e 's/^-l//'`
+ ;;
+ *@:}@;;
+ esac
+done
+AC_CHECK_LIB([$pc_libpython], [$1], [$2], [$3])])
+
+
+# PC_PYTHON_CHECK_CFLAGS
+# ----------------------
+# Find the Python CFLAGS
+AC_DEFUN([PC_PYTHON_CHECK_CFLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python CFLAGS], [pc_cv_python_cflags],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_cflags=`$PYTHON_CONFIG --cflags 2>> AS_MESSAGE_LOG_FD`
+else
+ pc_cv_python_cflags=
+fi
+])
+AC_SUBST([PYTHON_CFLAGS], [$pc_cv_python_cflags])])
+
+
+# PC_PYTHON_CHECK_LDFLAGS
+# -----------------------
+# Find the Python LDFLAGS
+AC_DEFUN([PC_PYTHON_CHECK_LDFLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python LDFLAGS], [pc_cv_python_ldflags],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_ldflags=`$PYTHON_CONFIG --ldflags 2>> AS_MESSAGE_LOG_FD`
+else
+ pc_cv_python_ldflags=
+fi
+])
+AC_SUBST([PYTHON_LDFLAGS], [$pc_cv_python_ldflags])])
+
+
+# PC_PYTHON_CHECK_EXTENSION_SUFFIX
+# --------------------------------
+# Find the Python extension suffix (i.e. '.cpython-32.so')
+AC_DEFUN([PC_PYTHON_CHECK_EXTENSION_SUFFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python extension suffix], [pc_cv_python_extension_suffix],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_extension_suffix=`$PYTHON_CONFIG --extension-suffix 2>>
AS_MESSAGE_LOG_FD`
+else
+ pc_cv_python_extension_suffix=
+fi
+])
+AC_SUBST([PYTHON_EXTENSION_SUFFIX], [$pc_cv_python_extension_suffix])])
+
+
+# PC_PYTHON_CHECK_ABI_FLAGS
+# -------------------------
+# Find the Python ABI flags
+AC_DEFUN([PC_PYTHON_CHECK_ABI_FLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+AC_CACHE_CHECK([for Python ABI flags], [pc_cv_python_abi_flags],
+[if test -x "$PYTHON_CONFIG"; then
+ pc_cv_python_abi_flags=`$PYTHON_CONFIG --abiflags 2>> AS_MESSAGE_LOG_FD`
+else
+ pc_cv_python_abi_flags=
+fi
+])
+AC_SUBST([PYTHON_ABI_FLAGS], [$pc_cv_python_abi_flags])])
+
+
+# PC_PYTHON_CHECK_PLATFORM
+# ------------------------
+# At times (like when building shared libraries) you may want
+# to know which OS platform Python thinks this is.
+AC_DEFUN([PC_PYTHON_CHECK_PLATFORM],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+AC_CACHE_CHECK([for Python platform],
+ [pc_cv_python_platform],
+ [AC_LANG_PUSH(Python)[]dnl
+ AC_LANG_CONFTEST([
+ AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+ sys.stdout.write(sys.platform)
+])])
+ pc_cv_python_platform=`$PYTHON conftest.py`
+ AC_LANG_POP(Python)[]dnl
+ ])
+AC_SUBST([PYTHON_PLATFORM], [$pc_cv_python_platform])
+])
+
+
+# PC_PYTHON_CHECK_SITE_DIR
+# ---------------------
+# The directory to which new libraries are installed (i.e. the
+# "site-packages" directory.
+AC_DEFUN([PC_PYTHON_CHECK_SITE_DIR],
+[AC_REQUIRE([AC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_PREFIX])[]dnl
+AC_CACHE_CHECK([for Python site-packages directory],
+ [pc_cv_python_site_dir],
+ [AC_LANG_PUSH(Python)[]dnl
+ if test "x$prefix" = xNONE
+ then
+ pc_py_prefix=$ac_default_prefix
+ else
+ pc_py_prefix=$prefix
+ fi
+ AC_LANG_CONFTEST([
+ AC_LANG_PROGRAM([dnl
+import sys
+try:
+ import sysconfig
+except:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(False, False, prefix='$pc_py_prefix')
+else:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$pc_py_prefix'})
+], [dnl
+ sys.stdout.write(sitedir)
+])])
+ pc_cv_python_site_dir=`$PYTHON conftest.py`
+ AC_LANG_POP(Python)[]dnl
+ case $pc_cv_python_site_dir in
+ $pc_py_prefix*)
+ pc__strip_prefix=`echo "$pc_py_prefix" | sed 's|.|.|g'`
+ pc_cv_python_site_dir=`echo "$pc_cv_python_site_dir" | sed
"s,^$pc__strip_prefix/,,"`
+ ;;
+ *)
+ case $pc_py_prefix in
+ /usr|/System*) ;;
+ *)
+ pc_cv_python_site_dir=lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
+AC_SUBST([pythondir], [\${prefix}/$pc_cv_python_site_dir])])#
PC_PYTHON_CHECK_SITE_DIR
+])
+
+# PC_PYTHON_SITE_PACKAGE_DIR
+# --------------------------
+# $PACKAGE directory under PYTHON_SITE_DIR
+AC_DEFUN([PC_PYTHON_SITE_PACKAGE_DIR],
+[AC_REQUIRE([PC_PYTHON_CHECK_SITE_DIR])[]dnl
+AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])])
+
+
+# PC_PYTHON_CHECK_EXEC_DIR
+# ------------------------
+# directory for installing python extension modules (shared libraries)
+AC_DEFUN([PC_PYTHON_CHECK_EXEC_DIR],
+[AC_REQUIRE([AC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_EXEC_PREFIX])[]dnl
+ AC_CACHE_CHECK([for Python extension module directory],
+ [pc_cv_python_exec_dir],
+ [AC_LANG_PUSH(Python)[]dnl
+ if test "x$pc_cv_python_exec_prefix" = xNONE
+ then
+ pc_py_exec_prefix=$pc_cv_python_prefix
+ else
+ pc_py_exec_prefix=$pc_cv_python_exec_prefix
+ fi
+ AC_LANG_CONFTEST([
+ AC_LANG_PROGRAM([dnl
+import sys
+try:
+ import sysconfig
+except:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(True, False,
prefix='$pc_py_exec_prefix')
+else:
+ sitedir = sysconfig.get_path('platlib',
vars={'platbase':'$pc_py_exec_prefix'})
+], [dnl
+ sys.stdout.write(sitedir)
+])])
+ pc_cv_python_exec_dir=`$PYTHON conftest.py`
+ AC_LANG_POP(Python)[]dnl
+ case $pc_cv_python_exec_dir in
+ $pc_py_exec_prefix*)
+ pc__strip_prefix=`echo "$pc_py_exec_prefix" | sed 's|.|.|g'`
+ pc_cv_python_exec_dir=`echo "$pc_cv_python_exec_dir" | sed
"s,^$pc__strip_prefix/,,"`
+ ;;
+ *)
+ case $pc_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ pc_cv_python_exec_dir=lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+ ])
+AC_SUBST([pyexecdir], [\${exec_prefix}/$pc_cv_python_pyexecdir])])
#PY_PYTHON_CHECK_EXEC_LIB_DIR
+])
+
+# PC_PYTHON_EXEC_PACKAGE_DIR
+# --------------------------
+# $PACKAGE directory under PYTHON_SITE_DIR
+AC_DEFUN([PC_PYTHON_EXEC_PACKAGE_DIR],
+[AC_REQUIRE([PC_PYTHON_CHECK_EXEC_DIR])[]dnl
+AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])])
+
+
+## -------------------------------------------- ##
+## 4. Looking for specific libs & functionality ##
+## -------------------------------------------- ##
+
+
+# PC_PYTHON_CHECK_MODULE(LIBRARY, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ----------------------------------------------------------------------
+# Macro for checking if a Python library is installed
+AC_DEFUN([PC_PYTHON_CHECK_MODULE],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
+AC_CACHE_CHECK([for Python '$1' library],
+ [[pc_cv_python_module_]pc_python_safe_mod],
+ [AC_LANG_PUSH(Python)[]dnl
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([dnl
+import sys
+try:
+ import $1
+except:
+ sys.exit(1)
+else:
+ sys.exit(0)
+], [])],
+ [[pc_cv_python_module_]pc_python_safe_mod="yes"],
+ [[pc_cv_python_module_]pc_python_safe_mod="no"])
+ AC_LANG_POP(Python)[]dnl
+ ])
+AS_IF([test "$[pc_cv_python_module_]pc_python_safe_mod" = "no"], [$3], [$2])
+])# PC_PYTHON_CHECK_MODULE
+
+
+# PC_PYTHON_CHECK_FUNC([LIBRARY], FUNCTION, ARGS, [ACTION-IF-FOUND],
[ACTION-IF-NOT-FOUND])
+#
---------------------------------------------------------------------------------------
+# Check to see if a given function call, optionally from a module, can
+# be successfully called
+AC_DEFUN([PC_PYTHON_CHECK_FUNC],
+[AC_REQUIRE([AC_PROG_PYTHON])[]dnl
+m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
+AC_CACHE_CHECK([for Python m4_ifnblank($1, '$1.$2()', '$2()') function],
+ [[pc_cv_python_func_]pc_python_safe_mod[_$2]],
+ [AC_LANG_PUSH(Python)[]dnl
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([dnl
+import sys
+m4_ifnblank([$1], [dnl
+try:
+ import $1
+except:
+ sys.exit(1)
+], [])],
+[
+m4_ifnblank([$1], [
+ try:
+ $1.$2($3)], [
+ try:
+ $2($3)])
+ except:
+ sys.exit(1)
+ else:
+ sys.exit(0)
+])],
+ [[pc_cv_python_func_]pc_python_safe_mod[_$2]="yes"],
+ [[pc_cv_python_func_]pc_python_safe_mod[_$2]="no"])
+ AC_LANG_POP(Python)[]dnl
+ ])
+AS_IF([test "$[pc_cv_python_func_]pc_python_safe_mod[_$2]" = "no"], [$5], [$4])
+])# PC_PYTHON_CHECK_FUNC
=== modified file 'gnu/bazaar/sha256sums'
--- a/gnu/bazaar/sha256sums 2012-09-22 14:11:12 +0000
+++ b/gnu/bazaar/sha256sums 2012-11-04 12:36:05 +0000
@@ -1,3 +1,3 @@
-967346fa6cc52971a8dfd5171ec22e1928cf455fb4317013b05b0915ff927982
download/bzr-2.5.1.tar.gz
-5d038b7420d49bbe30f00aeee7f139a3df815b11565072c9d1f42bb260cbc634
download/bzr-2.5.1-configure.tar.gz
-fbb2abbe51793c9fa16372bdafe2d107b38eb972e2760948b06e0559f9dcf1df
download/bzr-2.5.1.tar.gz.sig
+6c1ebc1ddd3ec8a7d1c93a74065d630c75099d750d1b7e5ba1f1134112193aa2
download/bzr-2.6b2.tar.gz
+d5880b13ec2b982caceb01fe2ece3cd36c5789d0680da579d94db988ce6ac5e8
download/bzr-2.6b2-configure.tar.gz
+19959ceb87608f5f959d01d6fe79cae030c230a5625839dbfbba00fdc4f6ac73
download/bzr-2.6b2.tar.gz.sig
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r1045: update bzr to 2.6b2,
Brandon Invergo <=