From 0d7ce4e2215ad5b168fa9db046401ed6b379f253 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Fri, 21 Mar 2003 01:55:41 +0000 Subject: Teach the Windows build & installer about the new csv module + DLL. --- PC/dllbase_nt.txt | 1 + PCbuild/_csv.dsp | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ PCbuild/pcbuild.dsw | 15 ++++++++ PCbuild/python20.wse | 18 ++++++++++ PCbuild/readme.txt | 2 ++ 5 files changed, 135 insertions(+) create mode 100644 PCbuild/_csv.dsp diff --git a/PC/dllbase_nt.txt b/PC/dllbase_nt.txt index 54b5db6..fdfe166 100644 --- a/PC/dllbase_nt.txt +++ b/PC/dllbase_nt.txt @@ -32,6 +32,7 @@ More standard extensions 1D100000 - 1e000000 - winsound 1D160000 - 1D170000 - bZ2 1D170000 - 1D180000 - datetime 1D180000 - 1D190000 + - _csv 1D180000 - 1D1A0000 Other extension modules - win32api 1e200000 - 1e220000 diff --git a/PCbuild/_csv.dsp b/PCbuild/_csv.dsp new file mode 100644 index 0000000..51d3073 --- /dev/null +++ b/PCbuild/_csv.dsp @@ -0,0 +1,99 @@ +# Microsoft Developer Studio Project File - Name="_csv" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=_csv - Win32 Release +!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 "_csv.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 "_csv.mak" CFG="_csv - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "_csv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "_csv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "_csv" +# PROP Scc_LocalPath ".." +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "_csv - 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\_csv" +# 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 "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /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 /subsystem:windows /dll /machine:I386 +# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv.pyd" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "_csv - 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\_csv" +# 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 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv_d.pyd" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "_csv - Win32 Release" +# Name "_csv - Win32 Debug" +# Begin Source File + +SOURCE=..\Modules\_csv.c +# End Source File +# End Target +# End Project diff --git a/PCbuild/pcbuild.dsw b/PCbuild/pcbuild.dsw index 7e80aaa..55e3a23 100644 --- a/PCbuild/pcbuild.dsw +++ b/PCbuild/pcbuild.dsw @@ -18,6 +18,21 @@ Package=<4> ############################################################################### +Project: "_csv"=.\_csv.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name pythoncore + End Project Dependency +}}} + +############################################################################### + Project: "_socket"=.\_socket.dsp - Package Owner=<4> Package=<5> diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index 41cb345..9cfe016 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -1700,6 +1700,11 @@ item: Install File Flags=0000000000000010 end item: Install File + Source=.\_csv.pyd + Destination=%MAINDIR%\DLLs\_csv.pyd + Flags=0000000000000010 +end +item: Install File Source=.\_sre.pyd Destination=%MAINDIR%\DLLs\_sre.pyd Flags=0000000000000010 @@ -1791,6 +1796,11 @@ item: Install File Flags=0000000000000010 end item: Install File + Source=.\_csv.lib + Destination=%MAINDIR%\libs\_csv.lib + Flags=0000000000000010 +end +item: Install File Source=.\_sre.lib Destination=%MAINDIR%\libs\_sre.lib Flags=0000000000000010 @@ -1927,6 +1937,14 @@ end item: Remark end item: Install File + Source=..\lib\csv\*.py + Destination=%MAINDIR%\Lib\csv + Description=CSV package + Flags=0000000100000010 +end +item: Remark +end +item: Install File Source=..\lib\distutils\*.py Destination=%MAINDIR%\Lib\distutils Description=Distribution utility modules diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 67fe894..07f9b2a 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -39,6 +39,8 @@ python .exe pythonw pythonw.exe, a variant of python.exe that doesn't pop up a DOS box +_csv + C support for the comma-separated values module _socket socketmodule.c _sre -- cgit v0.12