Rev 3984: (jam) Minor tweak to setup.py documentation for bug #295826 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3984
revision-id: pqm at pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
parent: john at arbash-meinel.com-20090205211128-u20k1ok49sxbrmxc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-05 21:53:22 +0000
message:
  (jam) Minor tweak to setup.py documentation for bug #295826
modified:
  doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3928.4.3
    revision-id: john at arbash-meinel.com-20090205211128-u20k1ok49sxbrmxc
    parent: john at arbash-meinel.com-20090108205605-ibsi18z7ljorq227
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bug_295826
    timestamp: Thu 2009-02-05 15:11:28 -0600
    message:
      fix typo in setup.py
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3928.4.2
    revision-id: john at arbash-meinel.com-20090108205605-ibsi18z7ljorq227
    parent: john at arbash-meinel.com-20090108204358-w84sffsgefp5vyp0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bug_295826
    timestamp: Thu 2009-01-08 14:56:05 -0600
    message:
      Document the build_ext portion of 'install' when not using extensions.
    modified:
      doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
    ------------------------------------------------------------
    revno: 3928.4.1
    revision-id: john at arbash-meinel.com-20090108204358-w84sffsgefp5vyp0
    parent: pqm at pqm.ubuntu.com-20090108161207-d95v7ouel5ibahh0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bug_295826
    timestamp: Thu 2009-01-08 14:43:58 -0600
    message:
      Change the warning from setup.py to make it a bit more obvious how to install
      without extensions.
    modified:
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'doc/en/user-guide/installing_bazaar.txt'
--- a/doc/en/user-guide/installing_bazaar.txt	2008-03-27 07:51:10 +0000
+++ b/doc/en/user-guide/installing_bazaar.txt	2009-01-08 20:56:05 +0000
@@ -52,6 +52,22 @@
 get things working.
 
 
+Installing into site-wide locations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Instead of adding the directory to your PATH, you can install bzr into the
+system locations using::
+
+  python setup.py install
+
+If you do not have a compiler, or do not have the python development tools
+installed, bzr supplies a (slower) pure-python implementation of all
+extensions. You can install without compiling extensions with::
+
+  python setup.py install build_ext --allow-python-fallbacks
+
+
+
 Running the development version
 -------------------------------
 

=== modified file 'setup.py'
--- a/setup.py	2008-12-28 05:21:23 +0000
+++ b/setup.py	2009-02-05 21:53:22 +0000
@@ -197,8 +197,8 @@
         except DistutilsPlatformError, e:
             if not self.allow_python_fallback:
                 log.warn('\n  Cannot build extensions.\n'
-                         '  Use --allow-python-fallback to use slower'
-                         ' python implementations instead.\n')
+                         '  Use "build_ext --allow-python-fallback" to use'
+                         ' slower python implementations instead.\n')
                 raise
             log.warn(str(e))
             log.warn('\n  Extensions cannot be built.\n'
@@ -209,9 +209,9 @@
             build_ext.build_extension(self, ext)
         except CCompilerError:
             if not self.allow_python_fallback:
-                log.warn('\n  Failed to build "%s".\n'
-                         '  Use --allow-python-fallback to use slower'
-                         ' python implementations instead.\n'
+                log.warn('\n  Cannot build extensions.\n'
+                         '  Use "build_ext --allow-python-fallback" to use'
+                         ' slower python implementations instead.\n'
                          % (ext.name,))
                 raise
             log.warn('\n  Building of "%s" extension failed.\n'