summaryrefslogtreecommitdiffstats
path: root/Doc/distutils
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-03 20:55:06 (GMT)
committerGeorg Brandl <georg@python.org>2009-01-03 20:55:06 (GMT)
commitc62ef8b4d9648c36218cb0142a6395a00c11885e (patch)
tree74d90ea6215a37553bb1cddfc4c4eddf947958e9 /Doc/distutils
parente92818f58c134549c8820073037a1655330bbea1 (diff)
downloadcpython-c62ef8b4d9648c36218cb0142a6395a00c11885e.zip
cpython-c62ef8b4d9648c36218cb0142a6395a00c11885e.tar.gz
cpython-c62ef8b4d9648c36218cb0142a6395a00c11885e.tar.bz2
Remove trailing whitespace.
Diffstat (limited to 'Doc/distutils')
-rw-r--r--Doc/distutils/apiref.rst16
-rw-r--r--Doc/distutils/builtdist.rst24
-rw-r--r--Doc/distutils/configfile.rst2
-rw-r--r--Doc/distutils/packageindex.rst4
-rw-r--r--Doc/distutils/setupscript.rst2
5 files changed, 24 insertions, 24 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index f9222ec..4d65de0 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -104,7 +104,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
| *package_dir* | A mapping of package to | a dictionary |
| | directory names | |
+--------------------+--------------------------------+-------------------------------------------------------------+
-
+
.. function:: run_setup(script_name[, script_args=None, stop_after='run'])
@@ -755,7 +755,7 @@ This module provides the following functions.
standard output, otherwise do nothing.
.. % \subsection{Compiler-specific modules}
-.. %
+.. %
.. % The following modules implement concrete subclasses of the abstract
.. % \class{CCompiler} class. They should not be instantiated directly, but should
.. % be created using \function{distutils.ccompiler.new_compiler()} factory
@@ -859,7 +859,7 @@ Contains :class:`MWerksCompiler`, an implementation of the abstract
Macintosh. Needs work to support CW on Windows or Mac OS X.
.. % \subsection{Utility modules}
-.. %
+.. %
.. % The following modules all provide general utility functions. They haven't
.. % all been documented yet.
@@ -1110,13 +1110,13 @@ other utility module.
For MacOS X systems the OS version reflects the minimal version on which
binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET``
- during the build of Python), not the OS version of the current system.
+ during the build of Python), not the OS version of the current system.
For universal binary builds on MacOS X the architecture value reflects
the univeral binary status instead of the architecture of the current
- processor. For 32-bit universal binaries the architecture is ``fat``,
- for 64-bit universal binaries the architecture is ``fat64``, and
- for 4-way universal binaries the architecture is ``universal``.
+ processor. For 32-bit universal binaries the architecture is ``fat``,
+ for 64-bit universal binaries the architecture is ``fat64``, and
+ for 4-way universal binaries the architecture is ``universal``.
Examples of returned values on MacOS X:
@@ -1693,7 +1693,7 @@ lines, and joining lines with backslashes.
.. % todo
.. % \section{Distutils Commands}
-.. %
+.. %
.. % This part of Distutils implements the various Distutils commands, such
.. % as \code{build}, \code{install} \&c. Each command is implemented as a
.. % separate module, with the command name as the name of the module.
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index 58b62f8..672faee 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -268,13 +268,13 @@ file winds up deep in the "build tree," in a temporary directory created by
.. % \longprogramopt{spec-file} option; used in conjunction with
.. % \longprogramopt{spec-only}, this gives you an opportunity to customize
.. % the \file{.spec} file manually:
-.. %
+.. %
.. % \ begin{verbatim}
.. % > python setup.py bdist_rpm --spec-only
.. % # ...edit dist/FooBar-1.0.spec
.. % > python setup.py bdist_rpm --spec-file=dist/FooBar-1.0.spec
.. % \ end{verbatim}
-.. %
+.. %
.. % (Although a better way to do this is probably to override the standard
.. % \command{bdist\_rpm} command with one that writes whatever else you want
.. % to the \file{.spec} file.)
@@ -334,31 +334,31 @@ The installer file will be written to the "distribution directory" --- normally
Cross-compiling on Windows
==========================
-Starting with Python 2.6, distutils is capable of cross-compiling between
-Windows platforms. In practice, this means that with the correct tools
+Starting with Python 2.6, distutils is capable of cross-compiling between
+Windows platforms. In practice, this means that with the correct tools
installed, you can use a 32bit version of Windows to create 64bit extensions
and vice-versa.
-To build for an alternate platform, specify the :option:`--plat-name` option
-to the build command. Valid values are currently 'win32', 'win-amd64' and
+To build for an alternate platform, specify the :option:`--plat-name` option
+to the build command. Valid values are currently 'win32', 'win-amd64' and
'win-ia64'. For example, on a 32bit version of Windows, you could execute::
python setup.py build --plat-name=win-amd64
-to build a 64bit version of your extension. The Windows Installers also
+to build a 64bit version of your extension. The Windows Installers also
support this option, so the command::
python setup.py build --plat-name=win-amd64 bdist_wininst
would create a 64bit installation executable on your 32bit version of Windows.
-To cross-compile, you must download the Python source code and cross-compile
+To cross-compile, you must download the Python source code and cross-compile
Python itself for the platform you are targetting - it is not possible from a
binary installtion of Python (as the .lib etc file for other platforms are
-not included.) In practice, this means the user of a 32 bit operating
-system will need to use Visual Studio 2008 to open the
-:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
-"x64" configuration of the 'pythoncore' project before cross-compiling
+not included.) In practice, this means the user of a 32 bit operating
+system will need to use Visual Studio 2008 to open the
+:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
+"x64" configuration of the 'pythoncore' project before cross-compiling
extensions is possible.
Note that by default, Visual Studio 2008 does not install 64bit compilers or
diff --git a/Doc/distutils/configfile.rst b/Doc/distutils/configfile.rst
index 0ccd5fd..890047c 100644
--- a/Doc/distutils/configfile.rst
+++ b/Doc/distutils/configfile.rst
@@ -63,7 +63,7 @@ universal :option:`--help` option, e.g. ::
--include-dirs (-I) list of directories to search for header files
--define (-D) C preprocessor macros to define
--undef (-U) C preprocessor macros to undefine
- --swig-opts list of SWIG command line options
+ --swig-opts list of SWIG command line options
[...]
Note that an option spelled :option:`--foo-bar` on the command-line is spelled
diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
index ef81d64..3715c82 100644
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -72,7 +72,7 @@ If you want to define another server a new section can be created::
index-servers =
pypi
other
-
+
[pypi]
repository: <repository-url>
username: <username>
@@ -91,4 +91,4 @@ Or even with the section name::
python setup.py register -r other
-
+
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 7971878..997dab7 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -213,7 +213,7 @@ This warning notwithstanding, options to SWIG can be currently passed like
this::
setup(...,
- ext_modules=[Extension('_foo', ['foo.i'],
+ ext_modules=[Extension('_foo', ['foo.i'],
swig_opts=['-modern', '-I../include'])],
py_modules=['foo'],
)