Skip to content

Commit 97c9640

Browse files
tim-onetim-one
committed
Windows: 2.1a1 changes so Python runs again. Note that the python20
subproject is gone, replaced by the new pythoncore subproject.
1 parent 6425efe commit 97c9640

9 files changed

Lines changed: 1757 additions & 1757 deletions

File tree

‎PC/config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@ typedef unsigned long uintptr_t;
327327
more (other compilers will still need to do so, but that's taken care
328328
of by the Distutils, so it's not a problem). */
329329
#ifdef _DEBUG
330-
#pragma comment(lib,"python20_d.lib")
330+
#pragma comment(lib,"python21_d.lib")
331331
#else
332-
#pragma comment(lib,"python20.lib")
332+
#pragma comment(lib,"python21.lib")
333333
#endif
334334
#endif /* USE_DL_EXPORT */
335335

‎PC/example_nt/readme.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ in the "Additional library path:" box.
144144
Now you need to add some mode-specific settings:
145145

146146
Select "Win32 Release" in the "Settings for:" dropdown list. Click the
147-
"Link" tab, choose the "Input" Category, and append "python20.lib" to the
147+
"Link" tab, choose the "Input" Category, and append "python21.lib" to the
148148
list in the "Object/library modules:" box.
149149

150150
Select "Win32 Debug" in the "Settings for:" dropdown list, and append
151-
"python20_d.lib" to the list in the "Object/library modules:" box. Then
151+
"python21_d.lib" to the list in the "Object/library modules:" box. Then
152152
click on the C/C++ tab, select "Code Generation" from the "Category:"
153153
dropdown list, and select "Debug Multithreaded DLL" from the "Use run-time
154154
library:" dropdown list.

‎PC/python_nt.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define PYTHON_VERSION MS_DLL_ID "." PYTHON_API_STRING "\0"
1414

1515
#ifndef PYTHON_DLL_NAME
16-
#define PYTHON_DLL_NAME "Python20.dll"
16+
#define PYTHON_DLL_NAME "Python21.dll"
1717
#endif
1818

1919
// String Tables

‎PCbuild/BUILDno.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ How to change the Windows build number:
3333

3434
Windows Python BUILD numbers
3535
----------------------------
36+
9 2.1a1
37+
17-Jan-2001
3638
8 2.0 (final)
3739
14-Oct-2000
3840
7 2.0c1

‎PCbuild/pcbuild.dsw‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
33

44
###############################################################################
55

6-
Project: "_socket"=".\_socket.dsp" - Package Owner=<4>
6+
Project: "_socket"=.\_socket.dsp - Package Owner=<4>
77

88
Package=<5>
99
{{{
@@ -12,13 +12,13 @@ Package=<5>
1212
Package=<4>
1313
{{{
1414
Begin Project Dependency
15-
Project_Dep_Name python20
15+
Project_Dep_Name pythoncore
1616
End Project Dependency
1717
}}}
1818

1919
###############################################################################
2020

21-
Project: "_sre"=".\_sre.dsp" - Package Owner=<4>
21+
Project: "_sre"=.\_sre.dsp - Package Owner=<4>
2222

2323
Package=<5>
2424
{{{
@@ -27,13 +27,13 @@ Package=<5>
2727
Package=<4>
2828
{{{
2929
Begin Project Dependency
30-
Project_Dep_Name python20
30+
Project_Dep_Name pythoncore
3131
End Project Dependency
3232
}}}
3333

3434
###############################################################################
3535

36-
Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4>
36+
Project: "_tkinter"=.\_tkinter.dsp - Package Owner=<4>
3737

3838
Package=<5>
3939
{{{
@@ -42,13 +42,13 @@ Package=<5>
4242
Package=<4>
4343
{{{
4444
Begin Project Dependency
45-
Project_Dep_Name python20
45+
Project_Dep_Name pythoncore
4646
End Project Dependency
4747
}}}
4848

4949
###############################################################################
5050

51-
Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4>
51+
Project: "bsddb"=.\bsddb.dsp - Package Owner=<4>
5252

5353
Package=<5>
5454
{{{
@@ -57,13 +57,13 @@ Package=<5>
5757
Package=<4>
5858
{{{
5959
Begin Project Dependency
60-
Project_Dep_Name python20
60+
Project_Dep_Name pythoncore
6161
End Project Dependency
6262
}}}
6363

6464
###############################################################################
6565

66-
Project: "mmap"=".\mmap.dsp" - Package Owner=<4>
66+
Project: "mmap"=.\mmap.dsp - Package Owner=<4>
6767

6868
Package=<5>
6969
{{{
@@ -72,13 +72,13 @@ Package=<5>
7272
Package=<4>
7373
{{{
7474
Begin Project Dependency
75-
Project_Dep_Name python20
75+
Project_Dep_Name pythoncore
7676
End Project Dependency
7777
}}}
7878

7979
###############################################################################
8080

81-
Project: "parser"=".\parser.dsp" - Package Owner=<4>
81+
Project: "parser"=.\parser.dsp - Package Owner=<4>
8282

8383
Package=<5>
8484
{{{
@@ -87,13 +87,13 @@ Package=<5>
8787
Package=<4>
8888
{{{
8989
Begin Project Dependency
90-
Project_Dep_Name python20
90+
Project_Dep_Name pythoncore
9191
End Project Dependency
9292
}}}
9393

9494
###############################################################################
9595

96-
Project: "pyexpat"=".\pyexpat.dsp" - Package Owner=<4>
96+
Project: "pyexpat"=.\pyexpat.dsp - Package Owner=<4>
9797

9898
Package=<5>
9999
{{{
@@ -102,13 +102,13 @@ Package=<5>
102102
Package=<4>
103103
{{{
104104
Begin Project Dependency
105-
Project_Dep_Name python20
105+
Project_Dep_Name pythoncore
106106
End Project Dependency
107107
}}}
108108

109109
###############################################################################
110110

111-
Project: "python"=".\python.dsp" - Package Owner=<4>
111+
Project: "python"=.\python.dsp - Package Owner=<4>
112112

113113
Package=<5>
114114
{{{
@@ -117,13 +117,13 @@ Package=<5>
117117
Package=<4>
118118
{{{
119119
Begin Project Dependency
120-
Project_Dep_Name python20
120+
Project_Dep_Name pythoncore
121121
End Project Dependency
122122
}}}
123123

124124
###############################################################################
125125

126-
Project: "python20"=".\python20.dsp" - Package Owner=<4>
126+
Project: "pythoncore"=.\pythoncore.dsp - Package Owner=<4>
127127

128128
Package=<5>
129129
{{{
@@ -135,7 +135,7 @@ Package=<4>
135135

136136
###############################################################################
137137

138-
Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4>
138+
Project: "pythonw"=.\pythonw.dsp - Package Owner=<4>
139139

140140
Package=<5>
141141
{{{
@@ -144,13 +144,13 @@ Package=<5>
144144
Package=<4>
145145
{{{
146146
Begin Project Dependency
147-
Project_Dep_Name python20
147+
Project_Dep_Name pythoncore
148148
End Project Dependency
149149
}}}
150150

151151
###############################################################################
152152

153-
Project: "select"=".\select.dsp" - Package Owner=<4>
153+
Project: "select"=.\select.dsp - Package Owner=<4>
154154

155155
Package=<5>
156156
{{{
@@ -159,13 +159,13 @@ Package=<5>
159159
Package=<4>
160160
{{{
161161
Begin Project Dependency
162-
Project_Dep_Name python20
162+
Project_Dep_Name pythoncore
163163
End Project Dependency
164164
}}}
165165

166166
###############################################################################
167167

168-
Project: "ucnhash"=".\ucnhash.dsp" - Package Owner=<4>
168+
Project: "ucnhash"=.\ucnhash.dsp - Package Owner=<4>
169169

170170
Package=<5>
171171
{{{
@@ -174,13 +174,13 @@ Package=<5>
174174
Package=<4>
175175
{{{
176176
Begin Project Dependency
177-
Project_Dep_Name python20
177+
Project_Dep_Name pythoncore
178178
End Project Dependency
179179
}}}
180180

181181
###############################################################################
182182

183-
Project: "unicodedata"=".\unicodedata.dsp" - Package Owner=<4>
183+
Project: "unicodedata"=.\unicodedata.dsp - Package Owner=<4>
184184

185185
Package=<5>
186186
{{{
@@ -189,13 +189,13 @@ Package=<5>
189189
Package=<4>
190190
{{{
191191
Begin Project Dependency
192-
Project_Dep_Name python20
192+
Project_Dep_Name pythoncore
193193
End Project Dependency
194194
}}}
195195

196196
###############################################################################
197197

198-
Project: "w9xpopen"=".\w9xpopen.dsp" - Package Owner=<4>
198+
Project: "w9xpopen"=.\w9xpopen.dsp - Package Owner=<4>
199199

200200
Package=<5>
201201
{{{
@@ -207,7 +207,7 @@ Package=<4>
207207

208208
###############################################################################
209209

210-
Project: "winreg"=".\winreg.dsp" - Package Owner=<4>
210+
Project: "winreg"=.\winreg.dsp - Package Owner=<4>
211211

212212
Package=<5>
213213
{{{
@@ -216,13 +216,13 @@ Package=<5>
216216
Package=<4>
217217
{{{
218218
Begin Project Dependency
219-
Project_Dep_Name python20
219+
Project_Dep_Name pythoncore
220220
End Project Dependency
221221
}}}
222222

223223
###############################################################################
224224

225-
Project: "winsound"=".\winsound.dsp" - Package Owner=<4>
225+
Project: "winsound"=.\winsound.dsp - Package Owner=<4>
226226

227227
Package=<5>
228228
{{{
@@ -231,13 +231,13 @@ Package=<5>
231231
Package=<4>
232232
{{{
233233
Begin Project Dependency
234-
Project_Dep_Name python20
234+
Project_Dep_Name pythoncore
235235
End Project Dependency
236236
}}}
237237

238238
###############################################################################
239239

240-
Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
240+
Project: "zlib"=.\zlib.dsp - Package Owner=<4>
241241

242242
Package=<5>
243243
{{{
@@ -246,7 +246,7 @@ Package=<5>
246246
Package=<4>
247247
{{{
248248
Begin Project Dependency
249-
Project_Dep_Name python20
249+
Project_Dep_Name pythoncore
250250
End Project Dependency
251251
}}}
252252

0 commit comments

Comments
 (0)