[Python-checkins] cpython (merge 3.2 -> default): (Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and

victor.stinner python-checkins at python.org
Wed May 25 01:17:48 CEST 2011


http://hg.python.org/cpython/rev/b2b0cae86f56
changeset:   70362:b2b0cae86f56
parent:      70359:75c2c3a45636
parent:      70361:4289cc96835e
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Wed May 25 01:16:49 2011 +0200
summary:
  (Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py

files:
  Makefile.pre.in  |  4 ++--
  Tools/msi/msi.py |  2 ++
  2 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -908,8 +908,8 @@
 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 \
 		collections concurrent concurrent/futures encodings \
 		email email/mime email/test email/test/data \
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1031,6 +1031,8 @@
             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':

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


More information about the Python-checkins mailing list