diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-24 23:16:49 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-24 23:16:49 (GMT) |
| commit | c520a1856fac2efbddc4379e4d9e8355f454e69c (patch) | |
| tree | 561efd644c3d10dc8ee142c730c8e7823de1af0c | |
| parent | f1a1af21eb024d32261ffcd1b32ca287da543a5a (diff) | |
| parent | 5b3265906f4eeca96a782bb9a90ca532c1c6cb27 (diff) | |
| download | cpython-c520a1856fac2efbddc4379e4d9e8355f454e69c.zip cpython-c520a1856fac2efbddc4379e4d9e8355f454e69c.tar.gz cpython-c520a1856fac2efbddc4379e4d9e8355f454e69c.tar.bz2 | |
(Merge 3.2) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 04d126f..dff1252 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -908,8 +908,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 \ 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 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': |