From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 24 May 2011 23:13:59 +0000 (+0200)
Subject: Issue #12057: Add cjkencodings directory to the Makefile and Tools/msi/msi.py
X-Git-Tag: v3.1.4rc1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46f8264b8e976ca0a39485c8405acddc8aa8af7a;p=python

Issue #12057: Add cjkencodings directory to the Makefile and Tools/msi/msi.py
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index c2fc69a792..270dfb4504 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -840,8 +840,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/data \
-		test/decimaltestdata \
+		tkinter/test/test_ttk site-packages test test/data \
+		test/cjkencodings test/decimaltestdata \
 		test/tracedmodules \
 		encodings \
 		email email/mime email/test email/test/data \
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index b668c7aaec..78ff51b604 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1021,6 +1021,8 @@ def add_files(db):
             lib.add_file("zipdir.zip")
         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=='output':