VC++ project changes to add new Unicode files and modules.

(I did this under VC++ 5.0 -- hope this doesn't break anything.)

diff --git a/PC/config.c b/PC/config.c
index 26772af6af39e12c1fd56bd967b1d32b7e99d95f..2efd6c2de108f735bf94907e77d30cdad2953f19 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -67,6 +67,8 @@ extern void initmsvcrt();
 extern void initwinsound();
 extern void init_locale();
 #endif
+extern void init_codecs();
+extern void initunicodedata();
 
 /* -- ADDMODULE MARKER 1 -- */
 
@@ -113,6 +115,9 @@ struct _inittab _PyImport_Inittab[] = {
        {"_locale", init_locale},
 #endif
 
+       {"_codecs", init_codecs},
+       {"unicodedata", initunicodedata},
+
 /* -- ADDMODULE MARKER 2 -- */
 
         /* This module "lives in" with marshal.c */

diff --git a/PCbuild/python15.dsp b/PCbuild/python15.dsp
index 3cb448057aa2d7c233580e2dd1aa205162fca369..b037ddc34111a891e244a3c2fe7eff13aba80001 100644 (file)
--- a/PCbuild/python15.dsp
+++ b/PCbuild/python15.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="python15" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# Microsoft Developer Studio Generated Build File, Format Version 5.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
@@ -18,14 +18,16 @@ CFG=python15 - Win32 Alpha Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "python15 - Win32 Release" (based on\\r
+ "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "python15 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
-!MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")\r
+!MESSAGE "python15 - Win32 Alpha Debug" (based on\\r
+ "Win32 (ALPHA) Dynamic-Link Library")\r
+!MESSAGE "python15 - Win32 Alpha Release" (based on\\r
+ "Win32 (ALPHA) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
 # PROP Scc_ProjName "python15"\r
 # PROP Scc_LocalPath ".."\r
 \r
@@ -45,10 +47,10 @@ CFG=python15 - Win32 Alpha Debug
 F90=df.exe\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c\r
 MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /i "..\Include" /d "NDEBUG"\r
@@ -76,10 +78,10 @@ LINK32=link.exe
 F90=df.exe\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c\r
 MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"\r
@@ -106,11 +108,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
 CPP=cl.exe\r
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /c\r
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /c\r
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /MTd /c\r
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /MDd /c\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /i "..\Include" /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"\r
@@ -138,8 +140,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /c\r
 # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /c\r
@@ -165,6 +167,21 @@ LINK32=link.exe
 # Name "python15 - Win32 Alpha Release"\r
 # Begin Source File\r
 \r
+SOURCE=..\Modules\_codecsmodule.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\Modules\_localemodule.c\r
 \r
 !IF  "$(CFG)" == "python15 - Win32 Release"\r
@@ -360,6 +377,21 @@ SOURCE=..\Objects\cobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\Python\codecs.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\Python\compile.c\r
 \r
 !IF  "$(CFG)" == "python15 - Win32 Release"\r
@@ -1256,6 +1288,17 @@ SOURCE=..\Python\pystate.c
 # Begin Source File\r
 \r
 SOURCE=..\PC\python_nt.rc\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1619,6 +1662,66 @@ SOURCE=..\Objects\typeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\Objects\unicodectype.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\Modules\unicodedata.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\Modules\unicodedatabase.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\Objects\unicodeobject.c\r
+\r
+!IF  "$(CFG)" == "python15 - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\PC\winsound.c\r
 \r
 !IF  "$(CFG)" == "python15 - Win32 Release"\r