Windows: ucnhash subproject no longer exists (/F merged into unicodedata).

diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw
index 99dc9c11391c9de81b3b1e4f3858daf606c77f5a..1e521ad7a3ee09aa552d1578dbf24433dad10fd2 100644 (file)
--- a/PCbuild/pcbuild.dsw
+++ b/PCbuild/pcbuild.dsw
@@ -165,21 +165,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ucnhash"=.\ucnhash.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name pythoncore\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "unicodedata"=.\unicodedata.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index ac064f55eae8323af92af227d74a83e82580f2a7..0a79a88dbf8de768d112c679bce36897c5c3d703 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -49,7 +49,7 @@ parser
     the parser module
 select
     selectmodule.c
-ucnhash, unicodedata
+unicodedata
     large tables of Unicode data
 winreg
     Windows registry API

diff --git a/PCbuild/ucnhash.dsp b/PCbuild/ucnhash.dsp
deleted file mode 100644 (file)
index 17f2a3b..0000000
--- a/PCbuild/ucnhash.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ucnhash" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=ucnhash - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "ucnhash.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "ucnhash.mak" CFG="ucnhash - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "ucnhash - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "ucnhash - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "ucnhash - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "ucnhash___Win32_Release0"\r
-# PROP BASE Intermediate_Dir "ucnhash___Win32_Release0"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release\ucnhash"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UCNHASH_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UCNHASH_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 /nologo /dll /machine:I386 /out:"ucnhash.pyd" /export:initucnhash\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "ucnhash - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "ucnhash___Win32_Debug0"\r
-# PROP BASE Intermediate_Dir "ucnhash___Win32_Debug0"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug\ucnhash"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UCNHASH_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UCNHASH_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"ucnhash_d.pyd" /pdbtype:sept /export:initucnhash\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "ucnhash - Win32 Release"\r
-# Name "ucnhash - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=..\Modules\ucnhash.c\r
-# End Source File\r
-# End Target\r
-# End Project\r

diff --git a/Tools/freeze/extensions_win32.ini b/Tools/freeze/extensions_win32.ini
index 78f37c8f8264b00a33a85ebc5d116c3bbd21239b..57719085c48a22d4cb381bbc51f378cc45753363 100644 (file)
--- a/Tools/freeze/extensions_win32.ini
+++ b/Tools/freeze/extensions_win32.ini
@@ -47,9 +47,6 @@ dsp=%PYTHONPREFIX%\PCBuild\parser.dsp
 [select]
 dsp=%PYTHONPREFIX%\PCBuild\select.dsp
 
-[ucnhash]
-dsp=%PYTHONPREFIX%\PCBuild\ucnhash.dsp
-
 [zlib]
 dsp=%PYTHONPREFIX%\PCBuild\zlib.dsp
 cl=/I %PYTHONPREFIX%\..\zlib113 /D WINDOWS /D _WINDOWS /D ZLIB_DLL /D WIN32