diff options
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/_testcapi.dsp (renamed from PCbuild/_test.dsp) | 32 | ||||
-rw-r--r-- | PCbuild/pcbuild.dsw | 8 | ||||
-rw-r--r-- | PCbuild/python20.wse | 8 | ||||
-rw-r--r-- | PCbuild/readme.txt | 4 |
4 files changed, 29 insertions, 23 deletions
diff --git a/PCbuild/_test.dsp b/PCbuild/_testcapi.dsp index 6bf5666..6bde272 100644 --- a/PCbuild/_test.dsp +++ b/PCbuild/_testcapi.dsp @@ -1,35 +1,35 @@ -# Microsoft Developer Studio Project File - Name="_test" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="_testcapi" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=_test - Win32 Debug +CFG=_testcapi - 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 "_test.mak". +!MESSAGE NMAKE /f "_testcapi.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 "_test.mak" CFG="_test - Win32 Debug" +!MESSAGE NMAKE /f "_testcapi.mak" CFG="_testcapi - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "_test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "_test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "_testcapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "_testcapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "_test" +# PROP Scc_ProjName "_testcapi" # PROP Scc_LocalPath ".." CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "_test - Win32 Release" +!IF "$(CFG)" == "_testcapi - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -39,7 +39,7 @@ RSC=rc.exe # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." -# PROP Intermediate_Dir "x86-temp-release\_test" +# PROP Intermediate_Dir "x86-temp-release\_testcapi" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe @@ -54,10 +54,10 @@ BSC32=bscmake.exe # 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:"./_test.pyd" /export:init_test +# 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:"./_testcapi.pyd" /export:init_testcapi # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "_test - Win32 Debug" +!ELSEIF "$(CFG)" == "_testcapi - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." -# PROP Intermediate_Dir "x86-temp-debug\_test" +# PROP Intermediate_Dir "x86-temp-debug\_testcapi" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" F90=df.exe @@ -82,18 +82,18 @@ BSC32=bscmake.exe # 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:"./_test_d.pyd" /pdbtype:sept /export:init_test +# 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:"./_testcapi_d.pyd" /pdbtype:sept /export:init_testcapi # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target -# Name "_test - Win32 Release" -# Name "_test - Win32 Debug" +# Name "_testcapi - Win32 Release" +# Name "_testcapi - Win32 Debug" # Begin Source File -SOURCE=..\Modules\_testmodule.c +SOURCE=..\Modules\_testcapimodule.c # End Source File # End Target # End Project diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw index fb89318..e09a253 100644 --- a/PCbuild/pcbuild.dsw +++ b/PCbuild/pcbuild.dsw @@ -41,11 +41,14 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name pythoncore
+ End Project Dependency
}}}
###############################################################################
-Project: "_test"=.\_test.dsp - Package Owner=<4>
+Project: "_testcapi"=.\_testcapi.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -53,6 +56,9 @@ Package=<5> Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name pythoncore
+ End Project Dependency
}}}
###############################################################################
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index c38da55..1568c14 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -697,8 +697,8 @@ item: Install File Flags=0000000000000010 end item: Install File - Source=%_SRC_%\PCbuild\_test.pyd - Destination=%MAINDIR%\DLLs\_test.pyd + Source=%_SRC_%\PCbuild\_testcapi.pyd + Destination=%MAINDIR%\DLLs\_testcapi.pyd Flags=0000000000000010 end item: Install File @@ -771,8 +771,8 @@ item: Install File Flags=0000000000000010 end item: Install File - Source=%_SRC_%\PCbuild\_test.lib - Destination=%MAINDIR%\libs\_test.lib + Source=%_SRC_%\PCbuild\_testcapi.lib + Destination=%MAINDIR%\libs\_testcapi.lib Flags=0000000000000010 end item: Install File diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 1415ba5..c6033f1 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -45,9 +45,9 @@ _sre Unicode-aware regular expression engine _symtable the _symtable module, symtablemodule.c -_test +_testcapi tests of the Python C API, run via Lib/test/test_capi.py, and - implemented by module Modules/_testmodule.c + implemented by module Modules/_testcapimodule.c mmap mmapmodule.c parser |