summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-24 23:15:59 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-24 23:15:59 (GMT)
commit5b3265906f4eeca96a782bb9a90ca532c1c6cb27 (patch)
tree740292f50c02b952fe2e830a83e481ab2d093358
parent8ed8416c2bbb7c56a935762304a5ed6fdd0a1b6f (diff)
parent46f8264b8e976ca0a39485c8405acddc8aa8af7a (diff)
downloadcpython-5b3265906f4eeca96a782bb9a90ca532c1c6cb27.zip
cpython-5b3265906f4eeca96a782bb9a90ca532c1c6cb27.tar.gz
cpython-5b3265906f4eeca96a782bb9a90ca532c1c6cb27.tar.bz2
(Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py
-rw-r--r--Makefile.pre.in4
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index db870a4..50ba086 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -909,8 +909,8 @@ EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \
- tkinter/test/test_ttk site-packages test \
- test/decimaltestdata test/xmltestdata test/subprocessdata \
+ tkinter/test/test_ttk site-packages test \
+ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
test/tracedmodules test/encoded_modules \
concurrent concurrent/futures encodings \
email email/mime email/test email/test/data \
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 53e652d..5db62cd 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1031,6 +1031,8 @@ def add_files(db):
lib.glob("*.0")
if dir=='tests' and parent.physical=='distutils':
lib.add_file("Setup.sample")
+ if dir=='cjkencodings':
+ lib.glob("*.txt")
if dir=='decimaltestdata':
lib.glob("*.decTest")
if dir=='xmltestdata':