mirror of
https://github.com/python/cpython
synced 2024-10-06 14:59:40 +00:00
Windows: 2.1a1 changes so Python runs again. Note that the python20
subproject is gone, replaced by the new pythoncore subproject.
This commit is contained in:
Tim Peters
parent
6425efe9ae
commit
97c9640cc9
|
|
@ -327,9 +327,9 @@ typedef unsigned long uintptr_t;
|
|||
more (other compilers will still need to do so, but that's taken care
|
||||
of by the Distutils, so it's not a problem). */
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib,"python20_d.lib")
|
||||
#pragma comment(lib,"python21_d.lib")
|
||||
#else
|
||||
#pragma comment(lib,"python20.lib")
|
||||
#pragma comment(lib,"python21.lib")
|
||||
#endif
|
||||
#endif /* USE_DL_EXPORT */
|
||||
|
||||
|
|
|
|||
|
|
@ -144,11 +144,11 @@ in the "Additional library path:" box.
|
|||
Now you need to add some mode-specific settings:
|
||||
|
||||
Select "Win32 Release" in the "Settings for:" dropdown list. Click the
|
||||
"Link" tab, choose the "Input" Category, and append "python20.lib" to the
|
||||
"Link" tab, choose the "Input" Category, and append "python21.lib" to the
|
||||
list in the "Object/library modules:" box.
|
||||
|
||||
Select "Win32 Debug" in the "Settings for:" dropdown list, and append
|
||||
"python20_d.lib" to the list in the "Object/library modules:" box. Then
|
||||
"python21_d.lib" to the list in the "Object/library modules:" box. Then
|
||||
click on the C/C++ tab, select "Code Generation" from the "Category:"
|
||||
dropdown list, and select "Debug Multithreaded DLL" from the "Use run-time
|
||||
library:" dropdown list.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#define PYTHON_VERSION MS_DLL_ID "." PYTHON_API_STRING "\0"
|
||||
|
||||
#ifndef PYTHON_DLL_NAME
|
||||
#define PYTHON_DLL_NAME "Python20.dll"
|
||||
#define PYTHON_DLL_NAME "Python21.dll"
|
||||
#endif
|
||||
|
||||
// String Tables
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@ How to change the Windows build number:
|
|||
|
||||
Windows Python BUILD numbers
|
||||
----------------------------
|
||||
9 2.1a1
|
||||
17-Jan-2001
|
||||
8 2.0 (final)
|
||||
14-Oct-2000
|
||||
7 2.0c1
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "_socket"=".\_socket.dsp" - Package Owner=<4>
|
||||
Project: "_socket"=.\_socket.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -12,13 +12,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "_sre"=".\_sre.dsp" - Package Owner=<4>
|
||||
Project: "_sre"=.\_sre.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -27,13 +27,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4>
|
||||
Project: "_tkinter"=.\_tkinter.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -42,13 +42,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4>
|
||||
Project: "bsddb"=.\bsddb.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -57,13 +57,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "mmap"=".\mmap.dsp" - Package Owner=<4>
|
||||
Project: "mmap"=.\mmap.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -72,13 +72,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "parser"=".\parser.dsp" - Package Owner=<4>
|
||||
Project: "parser"=.\parser.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -87,13 +87,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "pyexpat"=".\pyexpat.dsp" - Package Owner=<4>
|
||||
Project: "pyexpat"=.\pyexpat.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -102,13 +102,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "python"=".\python.dsp" - Package Owner=<4>
|
||||
Project: "python"=.\python.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -117,13 +117,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "python20"=".\python20.dsp" - Package Owner=<4>
|
||||
Project: "pythoncore"=.\pythoncore.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -135,7 +135,7 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4>
|
||||
Project: "pythonw"=.\pythonw.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -144,13 +144,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "select"=".\select.dsp" - Package Owner=<4>
|
||||
Project: "select"=.\select.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -159,13 +159,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "ucnhash"=".\ucnhash.dsp" - Package Owner=<4>
|
||||
Project: "ucnhash"=.\ucnhash.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -174,13 +174,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "unicodedata"=".\unicodedata.dsp" - Package Owner=<4>
|
||||
Project: "unicodedata"=.\unicodedata.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -189,13 +189,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "w9xpopen"=".\w9xpopen.dsp" - Package Owner=<4>
|
||||
Project: "w9xpopen"=.\w9xpopen.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -207,7 +207,7 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "winreg"=".\winreg.dsp" - Package Owner=<4>
|
||||
Project: "winreg"=.\winreg.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -216,13 +216,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "winsound"=".\winsound.dsp" - Package Owner=<4>
|
||||
Project: "winsound"=.\winsound.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -231,13 +231,13 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
|
||||
Project: "zlib"=.\zlib.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -246,7 +246,7 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name python20
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
|
|
|
|||
1709
PCbuild/python20.dsp
1709
PCbuild/python20.dsp
File diff suppressed because it is too large
Load diff
|
|
@ -817,8 +817,8 @@ item: Install File
|
|||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
Source=%_SRC_%\PCbuild\python20.lib
|
||||
Destination=%MAINDIR%\libs\python20.lib
|
||||
Source=%_SRC_%\PCbuild\python21.lib
|
||||
Destination=%MAINDIR%\libs\python21.lib
|
||||
Flags=0000000000000010
|
||||
end
|
||||
item: Remark
|
||||
|
|
@ -840,8 +840,8 @@ item: Remark
|
|||
Text=*** Main Python DLL ***
|
||||
end
|
||||
item: Install File
|
||||
Source=%_SRC_%\pcbuild\python20.dll
|
||||
Destination=%DLLDEST%\python20.dll
|
||||
Source=%_SRC_%\pcbuild\python21.dll
|
||||
Destination=%DLLDEST%\python21.dll
|
||||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
|
|
|
|||
1709
PCbuild/pythoncore.dsp
Normal file
1709
PCbuild/pythoncore.dsp
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -3,8 +3,6 @@ Building Python using VC++ 6.0 or 5.0
|
|||
This directory is used to build Python for Win32 platforms, e.g. Windows
|
||||
95, 98 and NT. It requires Microsoft Visual C++ 6.x or 5.x.
|
||||
(For other Windows platforms and compilers, see ../PC/readme.txt.)
|
||||
XXX There are still (Python 2.0b1) a few compiler warnings under VC6.
|
||||
XXX There are likely a few more under VC5.
|
||||
|
||||
Unlike older versions, there's no longer a need to copy the project files
|
||||
from a subdirectory of PC/ to the PCbuild directory -- they come in PCbuild.
|
||||
|
|
@ -15,8 +13,8 @@ and build the projects.
|
|||
|
||||
The proper order to build subprojects is:
|
||||
|
||||
1) python20 (this builds the main Python DLL and library files,
|
||||
python20.{dll, lib})
|
||||
1) pythoncore (this builds the main Python DLL and library files,
|
||||
python21.{dll, lib})
|
||||
|
||||
2) python (this builds the main Python executable, python.exe)
|
||||
|
||||
|
|
@ -26,16 +24,16 @@ The proper order to build subprojects is:
|
|||
to the subsystems they implement; see SUBPROJECTS below)
|
||||
|
||||
When using the Debug setting, the output files have a _d added to
|
||||
their name: python20_d.dll, python_d.exe, parser_d.pyd, and so on.
|
||||
their name: python21_d.dll, python_d.exe, parser_d.pyd, and so on.
|
||||
|
||||
SUBPROJECTS
|
||||
-----------
|
||||
These subprojects should build out of the box. Subprojects other than the
|
||||
main ones (python20, python, pythonw) generally build a DLL (renamed to
|
||||
main ones (python21, python, pythonw) generally build a DLL (renamed to
|
||||
.pyd) from a specific module so that users don't have to load the code
|
||||
supporting that module unless they import the module.
|
||||
|
||||
python20
|
||||
pythoncore
|
||||
.dll and .lib
|
||||
python
|
||||
.exe
|
||||
|
|
|
|||
Loading…
Reference in a new issue