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

4 files changed, 1 insertions, 118 deletions

diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw
index 99dc9c1139..1e521ad7a3 100644
--- a/PCbuild/pcbuild.dsw
+++ b/PCbuild/pcbuild.dsw
@@ -165,21 +165,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ucnhash"=.\ucnhash.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pythoncore

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "unicodedata"=.\unicodedata.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index ac064f55ea..0a79a88dbf 100644
--- 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
index 17f2a3b530..0000000000
--- a/PCbuild/ucnhash.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ucnhash" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=ucnhash - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "ucnhash.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ucnhash.mak" CFG="ucnhash - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ucnhash - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ucnhash - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "ucnhash - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "ucnhash___Win32_Release0"

-# PROP BASE Intermediate_Dir "ucnhash___Win32_Release0"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "."

-# PROP Intermediate_Dir "x86-temp-release\ucnhash"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UCNHASH_EXPORTS" /YX /FD /c

-# 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

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# 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

-# ADD LINK32 /nologo /dll /machine:I386 /out:"ucnhash.pyd" /export:initucnhash

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "ucnhash - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ucnhash___Win32_Debug0"

-# PROP BASE Intermediate_Dir "ucnhash___Win32_Debug0"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir "x86-temp-debug\ucnhash"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-F90=df.exe

-# 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

-# 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

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# 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

-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"ucnhash_d.pyd" /pdbtype:sept /export:initucnhash

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ucnhash - Win32 Release"

-# Name "ucnhash - Win32 Debug"

-# Begin Source File

-

-SOURCE=..\Modules\ucnhash.c

-# End Source File

-# End Target

-# End Project

diff --git a/Tools/freeze/extensions_win32.ini b/Tools/freeze/extensions_win32.ini
index 78f37c8f82..57719085c4 100644
--- 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