[Python-checkins] cpython: Issue #12406: Added upates for packaging's .exe files, command_template, and

vinay.sajip python-checkins at python.org
Sun Jul 3 11:35:47 CEST 2011


http://hg.python.org/cpython/rev/3ce11ddc9ec3
changeset:   71143:3ce11ddc9ec3
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sun Jul 03 10:35:41 2011 +0100
summary:
  Issue #12406: Added upates for packaging's .exe files, command_template, and sysconfig.cfg.

files:
  Tools/msi/msi.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -119,6 +119,7 @@
     "30":"{6953bc3b-6768-4291-8410-7914ce6e2ca8}",
     "31":"{4afcba0b-13e4-47c3-bebe-477428b46913}",
     "32":"{3ff95315-1096-4d31-bd86-601d5438ad5e}",
+    "33":"{f7581ca4-d368-4eea-8f82-d48c64c4f047}",
     } [major+minor]
 
 # Compute the name that Sphinx gives to the docfile
@@ -1010,6 +1011,8 @@
             lib.remove_pyc()
         # package READMEs if present
         lib.glob("README")
+        if dir=='Lib':
+            lib.add_file("sysconfig.cfg")
         if dir=='test' and parent.physical=='Lib':
             lib.add_file("185test.db")
             lib.add_file("audiotest.au")
@@ -1045,7 +1048,7 @@
         if dir=="Icons":
             lib.glob("*.gif")
             lib.add_file("idle.icns")
-        if dir=="command" and parent.physical=="distutils":
+        if dir=="command" and parent.physical in ("distutils", "packaging"):
             lib.glob("wininst*.exe")
             lib.add_file("command_template")
         if dir=="lib2to3":
@@ -1156,6 +1159,8 @@
             lib.add_file("README.txt", src="README")
         if f == 'Scripts':
             lib.add_file("2to3.py", src="2to3")
+            lib.add_file("pydoc3.py", src="pydoc3")
+            lib.add_file("pysetup3.py", src="pysetup3")
             if have_tcl:
                 lib.start_component("pydocgui.pyw", tcltk, keyfile="pydocgui.pyw")
                 lib.add_file("pydocgui.pyw")

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list