summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-21 11:28:17 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-21 11:28:17 (GMT)
commit3fc2ca3884bec42d9b68336183bb07a83311ea56 (patch)
treec6beef5b10f82cf2d8fc3ed8ec626fd36b70afc4 /Tools
parent49fd7fa4431da299196d74087df4a04f99f9c46f (diff)
downloadcpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.zip
cpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.tar.gz
cpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.tar.bz2
Merge trunk up to 45598.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/msi.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index efa1696..f7d384a 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -908,6 +908,12 @@ def add_files(db):
if files:
# Add an entry to the RemoveFile table to remove bytecode files.
lib.remove_pyc()
+ if dir.endswith('.egg-info'):
+ lib.add_file('entry_points.txt')
+ lib.add_file('PKG-INFO')
+ lib.add_file('top_level.txt')
+ lib.add_file('zip-safe')
+ continue
if dir=='test' and parent.physical=='Lib':
lib.add_file("185test.db")
lib.add_file("audiotest.au")
@@ -930,9 +936,12 @@ def add_files(db):
if dir=="Icons":
lib.glob("*.gif")
lib.add_file("idle.icns")
- if dir=="command":
+ if dir=="command" and parent.physical=="distutils":
lib.add_file("wininst-6.exe")
lib.add_file("wininst-7.1.exe")
+ if dir=="setuptools":
+ lib.add_file("cli.exe")
+ lib.add_file("gui.exe")
if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email":
# This should contain all non-.svn files listed in subversion
for f in os.listdir(lib.absolute):