diff options
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | PCbuild/_symtable.dsp | 99 | ||||
| -rw-r--r-- | PCbuild/pcbuild.dsw | 12 | ||||
| -rw-r--r-- | PCbuild/python20.wse | 10 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 8 |
5 files changed, 130 insertions, 4 deletions
@@ -112,7 +112,10 @@ Windows changes - Build: New subproject _test for the benefit of test_capi.py (see above). -- Build: subproject ucnhash is gone, since the code was folded into the +- Build: New subproject _symtable, for new DLL _symtable.pyd (a nascent + interface to some Python compiler internals). + +- Build: Subproject ucnhash is gone, since the code was folded into the unicodedata subproject. What's New in Python 2.1 alpha 1? diff --git a/PCbuild/_symtable.dsp b/PCbuild/_symtable.dsp new file mode 100644 index 0000000..bb43990 --- /dev/null +++ b/PCbuild/_symtable.dsp @@ -0,0 +1,99 @@ +# Microsoft Developer Studio Project File - Name="_symtable" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=_symtable - 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 "_symtable.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 "_symtable.mak" CFG="_symtable - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "_symtable - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "_symtable - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "_symtable" +# PROP Scc_LocalPath ".." +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "_symtable - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "." +# PROP Intermediate_Dir "x86-temp-release\_symtable" +# 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 "MMAP_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 "MMAP_EXPORTS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "NDEBUG" +# ADD RSC /l 0xc09 /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 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 /base:"0x1e1F0000" /dll /machine:I386 /out:"./_symtable.pyd" /export:init_symtable +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "_symtable - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "." +# PROP Intermediate_Dir "x86-temp-debug\_symtable" +# 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 "MMAP_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 "MMAP_EXPORTS" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0xc09 /d "_DEBUG" +# ADD RSC /l 0xc09 /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 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 /base:"0x1e1F0000" /dll /debug /machine:I386 /out:"./_symtable_d.pyd" /pdbtype:sept /export:init_symtable +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "_symtable - Win32 Release" +# Name "_symtable - Win32 Debug" +# Begin Source File + +SOURCE=..\Modules\symtablemodule.c +# End Source File +# End Target +# End Project diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw index 87c9ad9..fb89318 100644 --- a/PCbuild/pcbuild.dsw +++ b/PCbuild/pcbuild.dsw @@ -33,6 +33,18 @@ Package=<4> ###############################################################################
+Project: "_symtable"=.\_symtable.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "_test"=.\_test.dsp - Package Owner=<4>
Package=<5>
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index b5c89f6..c38da55 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -692,6 +692,11 @@ item: Install File Flags=0000000000000010 end item: Install File + Source=%_SRC_%\PCbuild\_symtable.pyd + Destination=%MAINDIR%\DLLs\_symtable.pyd + Flags=0000000000000010 +end +item: Install File Source=%_SRC_%\PCbuild\_test.pyd Destination=%MAINDIR%\DLLs\_test.pyd Flags=0000000000000010 @@ -761,6 +766,11 @@ item: Install File Flags=0000000000000010 end item: Install File + Source=%_SRC_%\PCbuild\_symtable.lib + Destination=%MAINDIR%\libs\_symtable.lib + Flags=0000000000000010 +end +item: Install File Source=%_SRC_%\PCbuild\_test.lib Destination=%MAINDIR%\libs\_test.lib Flags=0000000000000010 diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index f7a6e8c..1415ba5 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -43,6 +43,11 @@ _socket socketmodule.c _sre Unicode-aware regular expression engine +_symtable + the _symtable module, symtablemodule.c +_test + tests of the Python C API, run via Lib/test/test_capi.py, and + implemented by module Modules/_testmodule.c mmap mmapmodule.c parser @@ -55,9 +60,6 @@ winreg Windows registry API winsound play sounds (typically .wav files) under Windows -_test - tests of the Python C API, run via Lib/test/test_capi.py, and - implemented by module Modules/_testmodule.c The following subprojects will generally NOT build out of the box. They wrap code Python doesn't control, and you'll need to download the base |