summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-04-05 22:57:21 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-04-05 22:57:21 (GMT)
commitf637050f79c37701fa77dd6e424a5f3338243e81 (patch)
treea5f5a74f1fe2e7201bf7f88151046557576715ab /Doc
parent0d8f07305d7ddcf684c3db5680263c98cf70c067 (diff)
downloadcpython-f637050f79c37701fa77dd6e424a5f3338243e81.zip
cpython-f637050f79c37701fa77dd6e424a5f3338243e81.tar.gz
cpython-f637050f79c37701fa77dd6e424a5f3338243e81.tar.bz2
Merged revisions 71291 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71291 | tarek.ziade | 2009-04-06 00:51:09 +0200 (Mon, 06 Apr 2009) | 1 line Fixed #5095: msi missing from Distutils bdist formats ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/distutils/builtdist.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index 672faee..6e7e51c 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -80,7 +80,7 @@ The available formats for built distributions are:
+-------------+------------------------------+---------+
| ``tar`` | tar file (:file:`.tar`) | \(3) |
+-------------+------------------------------+---------+
-| ``zip`` | zip file (:file:`.zip`) | \(4) |
+| ``zip`` | zip file (:file:`.zip`) | (2),(4) |
+-------------+------------------------------+---------+
| ``rpm`` | RPM | \(5) |
+-------------+------------------------------+---------+
@@ -90,9 +90,12 @@ The available formats for built distributions are:
+-------------+------------------------------+---------+
| ``rpm`` | RPM | \(5) |
+-------------+------------------------------+---------+
-| ``wininst`` | self-extracting ZIP file for | (2),(4) |
+| ``wininst`` | self-extracting ZIP file for | \(4) |
| | Windows | |
+-------------+------------------------------+---------+
+| ``msi`` | Microsoft Installer. | |
++-------------+------------------------------+---------+
+
Notes:
@@ -102,8 +105,6 @@ Notes:
(2)
default on Windows
- **\*\*** to-do! **\*\***
-
(3)
requires external utilities: :program:`tar` and possibly one of :program:`gzip`,
:program:`bzip2`, or :program:`compress`
@@ -133,6 +134,8 @@ generates all the "dumb" archive formats (``tar``, ``ztar``, ``gztar``, and
+--------------------------+-----------------------+
| :command:`bdist_wininst` | wininst |
+--------------------------+-----------------------+
+| :command:`bdist_msi` | msi |
++--------------------------+-----------------------+
The following sections give details on the individual :command:`bdist_\*`
commands.