Add cjkcodecs to build process

diff --git a/PC/config.c b/PC/config.c
index 15671f68a3de3ec4b2d5be7c02b17d2f5d871770..a12f633a28a2de1e59563a2aa68a96b5991a0235 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -56,6 +56,32 @@ extern void initparser(void);
 extern void init_winreg(void);
 extern void initdatetime(void);
 
+extern void init_multibytecodec(void);
+extern void init_codecs_mapdata_ja_JP(void);
+extern void init_codecs_mapdata_ko_KR(void);
+extern void init_codecs_mapdata_zh_CN(void);
+extern void init_codecs_mapdata_zh_TW(void);
+extern void init_codecs_shift_jis(void);
+extern void init_codecs_cp932(void);
+extern void init_codecs_euc_jp(void);
+extern void init_codecs_iso2022_jp(void);
+extern void init_codecs_iso2022_jp_1(void);
+extern void init_codecs_iso2022_jp_2(void);
+extern void init_codecs_iso2022_jp_3(void);
+extern void init_codecs_iso2022_jp_ext(void);
+extern void init_codecs_shift_jisx0213(void);
+extern void init_codecs_euc_jisx0213(void);
+extern void init_codecs_euc_kr(void);
+extern void init_codecs_cp949(void);
+extern void init_codecs_johab(void);
+extern void init_codecs_iso2022_kr(void);
+extern void init_codecs_gb2312(void);
+extern void init_codecs_gbk(void);
+extern void init_codecs_gb18030(void);
+extern void init_codecs_hz(void);
+extern void init_codecs_big5(void);
+extern void init_codecs_cp950(void);
+
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */
 
@@ -121,6 +147,33 @@ struct _inittab _PyImport_Inittab[] = {
        {"xxsubtype", initxxsubtype},
        {"zipimport", initzipimport},
 
+       /* CJK codecs */
+       {"_multibytecodec", init_multibytecodec},
+       {"_codecs_mapdata_ja_JP", init_codecs_mapdata_ja_JP},
+       {"_codecs_mapdata_ko_KR", init_codecs_mapdata_ko_KR},
+       {"_codecs_mapdata_zh_CN", init_codecs_mapdata_zh_CN},
+       {"_codecs_mapdata_zh_TW", init_codecs_mapdata_zh_TW},
+       {"_codecs_shift_jis", init_codecs_shift_jis},
+       {"_codecs_cp932", init_codecs_cp932},
+       {"_codecs_euc_jp", init_codecs_euc_jp},
+       {"_codecs_iso2022_jp", init_codecs_iso2022_jp},
+       {"_codecs_iso2022_jp_1", init_codecs_iso2022_jp_1},
+       {"_codecs_iso2022_jp_2", init_codecs_iso2022_jp_2},
+       {"_codecs_iso2022_jp_3", init_codecs_iso2022_jp_3},
+       {"_codecs_iso2022_jp_ext", init_codecs_iso2022_jp_ext},
+       {"_codecs_shift_jisx0213", init_codecs_shift_jisx0213},
+       {"_codecs_euc_jisx0213", init_codecs_euc_jisx0213},
+       {"_codecs_euc_kr", init_codecs_euc_kr},
+       {"_codecs_cp949", init_codecs_cp949},
+       {"_codecs_johab", init_codecs_johab},
+       {"_codecs_iso2022_kr", init_codecs_iso2022_kr},
+       {"_codecs_gb2312", init_codecs_gb2312},
+       {"_codecs_gbk", init_codecs_gbk},
+       {"_codecs_gb18030", init_codecs_gb18030},
+       {"_codecs_hz", init_codecs_hz},
+       {"_codecs_big5", init_codecs_big5},
+       {"_codecs_cp950", init_codecs_cp950},
+
 /* tools/freeze/makeconfig.py marker for additional "_inittab" entries */
 /* -- ADDMODULE MARKER 2 -- */
 

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 7eeb787454c33b0365046080c3590f39a9792425..6785f57b77a17a339e98aadda73245798e3e89f8 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -153,6 +153,9 @@
        <References>
        </References>
        <Files>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_big5.c">
+               </File>
                <File
                        RelativePath="..\Modules\_bisectmodule.c">
                </File>
@@ -175,9 +178,36 @@
                                        PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_cp932.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_cp949.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_cp950.c">
+               </File>
                <File
                        RelativePath="..\Modules\_csv.c">
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_euc_jisx0213.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_euc_jp.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_euc_kr.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_gb18030.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_gb2312.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_gbk.c">
+               </File>
                <File
                        RelativePath="..\Modules\_hotshot.c">
                        <FileConfiguration
@@ -197,6 +227,30 @@
                                        PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_hz.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_jp.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_jp_1.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_jp_2.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_jp_3.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_jp_ext.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_iso2022_kr.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_johab.c">
+               </File>
                <File
                        RelativePath="..\Modules\_localemodule.c">
                        <FileConfiguration
@@ -235,6 +289,12 @@
                                        PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_shift_jis.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\_shift_jisx0213.c">
+               </File>
                <File
                        RelativePath="..\Modules\_sre.c">
                </File>
@@ -1365,6 +1425,18 @@
                                        PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\mapdata_ja_JP.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\mapdata_ko_KR.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\mapdata_zh_CN.c">
+               </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\mapdata_zh_TW.c">
+               </File>
                <File
                        RelativePath="..\Python\marshal.c">
                        <FileConfiguration
@@ -1539,6 +1611,9 @@
                                        PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
                        </FileConfiguration>
                </File>
+               <File
+                       RelativePath="..\Modules\cjkcodecs\multibytecodec.c">
+               </File>
                <File
                        RelativePath="..\Parser\myreadline.c">
                        <FileConfiguration