From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 24 May 2011 23:15:59 +0000 (+0200)
Subject: (Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
X-Git-Tag: v3.2.1rc2~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b3265906f4eeca96a782bb9a90ca532c1c6cb27;p=thirdparty%2FPython%2Fcpython.git

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

5b3265906f4eeca96a782bb9a90ca532c1c6cb27
diff --cc Makefile.pre.in
index db870a482922,270dfb4504f9..50ba086e2994
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -909,12 -840,12 +909,12 @@@ 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/data \
 -		test/cjkencodings test/decimaltestdata \
 -		test/tracedmodules \
 -		encodings \
++		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 \
 -		html json json/tests http dbm xmlrpc \
 +		html json test/json_tests http dbm xmlrpc \
  		sqlite3 sqlite3/test \
  		logging csv wsgiref urllib \
  		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
diff --cc Tools/msi/msi.py
index 53e652d57fd6,78ff51b6045e..5db62cdd2469
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@@ -1024,22 -1018,15 +1024,24 @@@ def add_files(db)
              lib.glob("*.uue")
              lib.glob("*.pem")
              lib.glob("*.pck")
 +            lib.glob("cfgparser.*")
 +            lib.add_file("zip_cp437_header.zip")
              lib.add_file("zipdir.zip")
 +        if dir=='capath':
 +            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':
 +            lib.glob("*.xml")
 +            lib.add_file("test.xml.out")
          if dir=='output':
              lib.glob("test_*")
 +        if dir=='sndhdrdata':
 +            lib.glob("sndhdr.*")
          if dir=='idlelib':
              lib.glob("*.def")
              lib.add_file("idle.bat")