[pywin32-checkins] /hgroot/pywin32/pywin32: Remove several .dsp files and specify s...
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
Menu
▾
▴
[pywin32-checkins] /hgroot/pywin32/pywin32: Remove several .dsp files and specify s...
|
From: <pyw...@li...> - 2013-04-08 06:04:52
|
changeset 125b33816ad5 in /hgroot/pywin32/pywin32 details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=125b33816ad5 summary: Remove several .dsp files and specify sources in setup.py diffstat: setup.py | 44 ++++++++---- win32/perfmon.dsp | 117 -------------------------------- win32/perfmondata.dsp | 179 -------------------------------------------------- win32/win2kras.dsp | 99 --------------------------- win32/win32help.dsp | 102 ---------------------------- win32/win32lz.dsp | 102 ---------------------------- win32/win32pdh.dsp | 102 ---------------------------- win32/win32print.dsp | 97 --------------------------- win32/win32ras.dsp | 102 ---------------------------- win32/win32trace.dsp | 102 ---------------------------- win32/win32wnet.dsp | 113 ------------------------------- 11 files changed, 29 insertions(+), 1130 deletions(-) diffs (truncated from 1249 to 300 lines): diff -r ce279fb3d610 -r 125b33816ad5 setup.py --- a/setup.py Sun Apr 07 23:55:50 2013 -0400 +++ b/setup.py Mon Apr 08 02:04:05 2013 -0400 @@ -1617,11 +1617,15 @@ win32_extensions = [pywintypes] win32_extensions.append( - WinExt_win32("perfmondata", - libraries="advapi32", - unicode_mode=True, - export_symbol_file = "win32/src/PerfMon/perfmondata.def", - is_regular_dll = 1, + WinExt_win32("perfmondata", + sources=[ + "win32/src/PerfMon/perfmondata.cpp", + "win32/src/PerfMon/PyPerfMsgs.mc", + ], + libraries="advapi32", + unicode_mode=True, + export_symbol_file = "win32/src/PerfMon/perfmondata.def", + is_regular_dll = 1, ), ) @@ -1629,9 +1633,14 @@ # (name, libraries, UNICODE, WINVER, sources) ("mmapfile", "", None, None, "win32/src/mmapfilemodule.cpp"), ("odbc", "odbc32 odbccp32", None, None, "win32/src/odbc.cpp"), - ("perfmon", "", True), + ("perfmon", "", True, None, """ + win32/src/PerfMon/MappingManager.cpp + win32/src/PerfMon/PerfCounterDefn.cpp + win32/src/PerfMon/PerfObjectType.cpp + win32/src/PerfMon/PyPerfMon.cpp + """), ("timer", "user32", None, None, "win32/src/timermodule.cpp"), - ("win2kras", "rasapi32", None, 0x0500), + ("win2kras", "rasapi32", None, 0x0500, "win32/src/win2krasmodule.cpp"), ("win32cred", "AdvAPI32 credui", True, 0x0501, 'win32/src/win32credmodule.cpp'), ("win32crypt", "Crypt32", None, 0x0500, 'win32/src/win32crypt.i'), ("win32file", "", None, 0x0500, """ @@ -1643,19 +1652,19 @@ # win32gui handled below ("win32job", "user32", True, 0x0500, 'win32/src/win32job.i'), - ("win32lz", "lz32", None), + ("win32lz", "lz32", None, None, "win32/src/win32lzmodule.cpp"), ("win32net", "netapi32 advapi32", True, None, """ win32/src/win32net/win32netfile.cpp win32/src/win32net/win32netgroup.cpp win32/src/win32net/win32netmisc.cpp win32/src/win32net/win32netmodule.cpp win32/src/win32net/win32netsession.cpp win32/src/win32net/win32netuse.cpp win32/src/win32net/win32netuser.cpp """), - ("win32pdh", "", True), + ("win32pdh", "", True, None, "win32/src/win32pdhmodule.cpp"), ("win32pipe", "", None, None, 'win32/src/win32pipe.i win32/src/win32popen.cpp'), - ("win32print", "winspool user32 gdi32", None, 0x0500), + ("win32print", "winspool user32 gdi32", None, 0x0500, "win32/src/win32print/win32print.cpp"), ("win32process", "advapi32 user32", None, 0x0500, "win32/src/win32process.i"), ("win32profile", "Userenv", True, None, 'win32/src/win32profilemodule.cpp'), - ("win32ras", "rasapi32 user32", None, 0x0500), + ("win32ras", "rasapi32 user32", None, 0x0500, "win32/src/win32rasmodule.cpp"), ("win32security", "advapi32 user32 netapi32", True, 0x0500, """ win32/src/win32security.i win32/src/win32security_sspi.cpp win32/src/win32security_ds.cpp @@ -1664,12 +1673,16 @@ win32/src/win32service_messages.mc win32/src/win32service.i """), - ("win32trace", "advapi32", None), - ("win32wnet", "netapi32 mpr", None), + ("win32trace", "advapi32", None, None, "win32/src/win32trace.cpp"), + ("win32wnet", "netapi32 mpr", None, None, """ + win32/src/win32wnet/PyNCB.cpp + win32/src/win32wnet/PyNetresource.cpp + win32/src/win32wnet/win32wnet.cpp + """), ("win32inet", "wininet", None, 0x500, """ win32/src/win32inet.i - win32/src/win32inet_winhttp.cpp""" - ), + win32/src/win32inet_winhttp.cpp + """), ("win32console", "kernel32", True, 0x0501, "win32/src/win32consolemodule.cpp"), ("win32ts", "WtsApi32", True, 0x0501, "win32/src/win32tsmodule.cpp"), ("_win32sysloader", "", None, 0x0501, "win32/src/_win32sysloader.cpp"), @@ -1760,6 +1773,7 @@ win32help_libs += " RunTmChk" win32_extensions += [ WinExt_win32('win32help', + sources = ["win32/src/win32helpmodule.cpp"], libraries=win32help_libs, windows_h_version = 0x500), ] diff -r ce279fb3d610 -r 125b33816ad5 win32/perfmon.dsp --- a/win32/perfmon.dsp Sun Apr 07 23:55:50 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -# Microsoft Developer Studio Project File - Name="perfmon" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=perfmon - 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 "perfmon.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 "perfmon.mak" CFG="perfmon - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "perfmon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "perfmon - 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)" == "perfmon - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Build" -# PROP BASE Intermediate_Dir "Build\Temp\perfmon\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Build" -# PROP Intermediate_Dir "Build\Temp\perfmon\Release" -# 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" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\win32\src" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "STRICT" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# 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 /subsystem:windows /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 /subsystem:windows /dll /debug /machine:I386 /out:"Build\perfmon.pyd" - -!ELSEIF "$(CFG)" == "perfmon - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Build" -# PROP BASE Intermediate_Dir "Build\Temp\perfmon\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Build" -# PROP Intermediate_Dir "Build\Temp\perfmon\Debug" -# 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" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\win32\src" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "STRICT" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# 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 /subsystem:windows /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 /subsystem:windows /dll /debug /machine:I386 /out:"Build\perfmon_d.pyd" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "perfmon - Win32 Release" -# Name "perfmon - Win32 Debug" -# Begin Source File - -SOURCE=.\src\perfmon\MappingManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\perfmon\PerfCounterDefn.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\perfmon\PerfObjectType.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\perfmon\PyPerfMon.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\perfmon\pyperfmon.h -# End Source File -# Begin Source File - -SOURCE=.\src\perfmon\PyPerfMonControl.h -# End Source File -# End Target -# End Project diff -r ce279fb3d610 -r 125b33816ad5 win32/perfmondata.dsp --- a/win32/perfmondata.dsp Sun Apr 07 23:55:50 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,179 +0,0 @@ -# Microsoft Developer Studio Project File - Name="perfmondata" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=perfmondata - 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 "perfmondata.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 "perfmondata.mak" CFG="perfmondata - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "perfmondata - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "perfmondata - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Python/win32/PerfMon", PNCAAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "perfmondata - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Build" -# PROP BASE Intermediate_Dir "Build\Temp\perfmondata\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Build" -# PROP Intermediate_Dir "Build\Temp\perfmon\Release" -# 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" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "STRICT" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# 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 /subsystem:windows /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 /subsystem:windows /dll /debug /machine:I386 /def:".\src\perfmon\perfmondata.def" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "perfmondata - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Build" -# PROP BASE Intermediate_Dir "Build\Temp\perfmondata\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Build" -# PROP Intermediate_Dir "Build\Temp\perfmondata\Debug" -# 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" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "STRICT" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0xc09 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo |