Commit 0d7ce4e2 authored by Tim Peters's avatar Tim Peters

Teach the Windows build & installer about the new csv module + DLL.

parent b59798b1
...@@ -32,6 +32,7 @@ More standard extensions 1D100000 - 1e000000 ...@@ -32,6 +32,7 @@ More standard extensions 1D100000 - 1e000000
- winsound 1D160000 - 1D170000 - winsound 1D160000 - 1D170000
- bZ2 1D170000 - 1D180000 - bZ2 1D170000 - 1D180000
- datetime 1D180000 - 1D190000 - datetime 1D180000 - 1D190000
- _csv 1D180000 - 1D1A0000
Other extension modules Other extension modules
- win32api 1e200000 - 1e220000 - win32api 1e200000 - 1e220000
......
# 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
...@@ -18,6 +18,21 @@ Package=<4> ...@@ -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> Project: "_socket"=.\_socket.dsp - Package Owner=<4>
Package=<5> Package=<5>
......
...@@ -1699,6 +1699,11 @@ item: Install File ...@@ -1699,6 +1699,11 @@ item: Install File
Description=Extension modules Description=Extension modules
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File
Source=.\_csv.pyd
Destination=%MAINDIR%\DLLs\_csv.pyd
Flags=0000000000000010
end
item: Install File item: Install File
Source=.\_sre.pyd Source=.\_sre.pyd
Destination=%MAINDIR%\DLLs\_sre.pyd Destination=%MAINDIR%\DLLs\_sre.pyd
...@@ -1790,6 +1795,11 @@ item: Install File ...@@ -1790,6 +1795,11 @@ item: Install File
Description=Link library files Description=Link library files
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File
Source=.\_csv.lib
Destination=%MAINDIR%\libs\_csv.lib
Flags=0000000000000010
end
item: Install File item: Install File
Source=.\_sre.lib Source=.\_sre.lib
Destination=%MAINDIR%\libs\_sre.lib Destination=%MAINDIR%\libs\_sre.lib
...@@ -1926,6 +1936,14 @@ item: Install File ...@@ -1926,6 +1936,14 @@ item: Install File
end end
item: Remark item: Remark
end end
item: Install File
Source=..\lib\csv\*.py
Destination=%MAINDIR%\Lib\csv
Description=CSV package
Flags=0000000100000010
end
item: Remark
end
item: Install File item: Install File
Source=..\lib\distutils\*.py Source=..\lib\distutils\*.py
Destination=%MAINDIR%\Lib\distutils Destination=%MAINDIR%\Lib\distutils
......
...@@ -39,6 +39,8 @@ python ...@@ -39,6 +39,8 @@ python
.exe .exe
pythonw pythonw
pythonw.exe, a variant of python.exe that doesn't pop up a DOS box 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 _socket
socketmodule.c socketmodule.c
_sre _sre
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment