Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
fa2c61a2
Commit
fa2c61a2
authored
Feb 20, 2011
by
Georg Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More automated version replacement.
parent
3ebb6b36
Changes
21
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
864 additions
and
864 deletions
+864
-864
PC/VC6/pythoncore.dsp
PC/VC6/pythoncore.dsp
+2
-2
PC/VC6/readme.txt
PC/VC6/readme.txt
+2
-2
PC/VS7.1/pythoncore.vcproj
PC/VS7.1/pythoncore.vcproj
+12
-12
PC/VS7.1/readme.txt
PC/VS7.1/readme.txt
+2
-2
PC/VS8.0/build_ssl.bat
PC/VS8.0/build_ssl.bat
+2
-2
PC/VS8.0/kill_python.c
PC/VS8.0/kill_python.c
+1
-1
PC/VS8.0/pyproject.vsprops
PC/VS8.0/pyproject.vsprops
+1
-1
PC/example_nt/example.vcproj
PC/example_nt/example.vcproj
+2
-2
PC/os2emx/Makefile
PC/os2emx/Makefile
+1
-1
PC/os2emx/README.os2emx
PC/os2emx/README.os2emx
+1
-1
PC/os2emx/python33.def
PC/os2emx/python33.def
+125
-125
PC/pyconfig.h
PC/pyconfig.h
+2
-2
PC/python3.def
PC/python3.def
+687
-687
PC/python3.mak
PC/python3.mak
+6
-6
PC/python33gen.py
PC/python33gen.py
+4
-4
PC/python33stub.def
PC/python33stub.def
+1
-1
PCbuild/build_ssl.bat
PCbuild/build_ssl.bat
+2
-2
PCbuild/kill_python.c
PCbuild/kill_python.c
+1
-1
PCbuild/pyproject.vsprops
PCbuild/pyproject.vsprops
+1
-1
PCbuild/readme.txt
PCbuild/readme.txt
+1
-1
README
README
+8
-8
No files found.
PC/VC6/pythoncore.dsp
View file @
fa2c61a2
...
...
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# 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 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python3
2
.dll"
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python3
3
.dll"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
...
...
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
# 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 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python3
2
_d.dll" /pdbtype:sept
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python3
3
_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
...
...
PC/VC6/readme.txt
View file @
fa2c61a2
...
...
@@ -12,7 +12,7 @@ and build the projects.
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
python3
2
.{dll, lib} in Release mode)
python3
3
.{dll, lib} in Release mode)
2) python (this builds the main Python executable,
python.exe in Release mode)
...
...
@@ -23,7 +23,7 @@ The proper order to build subprojects:
to the subsystems they implement; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
their name: python3
2
_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
their name: python3
3
_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
SUBPROJECTS
-----------
...
...
PC/VS7.1/pythoncore.vcproj
View file @
fa2c61a2
...
...
@@ -39,15 +39,15 @@
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"getbuildinfo.o"
OutputFile=
"./python3
2
.dll"
OutputFile=
"./python3
3
.dll"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
IgnoreDefaultLibraryNames=
"libc"
GenerateDebugInformation=
"TRUE"
ProgramDatabaseFile=
".\./python3
2
.pdb"
ProgramDatabaseFile=
".\./python3
3
.pdb"
SubSystem=
"2"
BaseAddress=
"0x1e000000"
ImportLibrary=
".\./python3
2
.lib"
ImportLibrary=
".\./python3
3
.lib"
TargetMachine=
"1"
/>
<Tool
Name=
"VCMIDLTool"
/>
...
...
@@ -99,15 +99,15 @@
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"getbuildinfo.o"
OutputFile=
"./python3
2
_d.dll"
OutputFile=
"./python3
3
_d.dll"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
IgnoreDefaultLibraryNames=
"libc"
GenerateDebugInformation=
"TRUE"
ProgramDatabaseFile=
".\./python3
2
_d.pdb"
ProgramDatabaseFile=
".\./python3
3
_d.pdb"
SubSystem=
"2"
BaseAddress=
"0x1e000000"
ImportLibrary=
".\./python3
2
_d.lib"
ImportLibrary=
".\./python3
3
_d.lib"
TargetMachine=
"1"
/>
<Tool
Name=
"VCMIDLTool"
/>
...
...
@@ -166,15 +166,15 @@
Name=
"VCLinkerTool"
AdditionalOptions=
" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies=
"getbuildinfo.o"
OutputFile=
"./python3
2
.dll"
OutputFile=
"./python3
3
.dll"
LinkIncremental=
"1"
SuppressStartupBanner=
"FALSE"
IgnoreDefaultLibraryNames=
"libc"
GenerateDebugInformation=
"TRUE"
ProgramDatabaseFile=
".\./python3
2
.pdb"
ProgramDatabaseFile=
".\./python3
3
.pdb"
SubSystem=
"2"
BaseAddress=
"0x1e000000"
ImportLibrary=
".\./python3
2
.lib"
ImportLibrary=
".\./python3
3
.lib"
TargetMachine=
"0"
/>
<Tool
Name=
"VCMIDLTool"
/>
...
...
@@ -233,15 +233,15 @@
Name=
"VCLinkerTool"
AdditionalOptions=
" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies=
"getbuildinfo.o"
OutputFile=
"./python3
2
.dll"
OutputFile=
"./python3
3
.dll"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
IgnoreDefaultLibraryNames=
"libc"
GenerateDebugInformation=
"TRUE"
ProgramDatabaseFile=
".\./python3
2
.pdb"
ProgramDatabaseFile=
".\./python3
3
.pdb"
SubSystem=
"2"
BaseAddress=
"0x1e000000"
ImportLibrary=
".\./python3
2
.lib"
ImportLibrary=
".\./python3
3
.lib"
TargetMachine=
"0"
/>
<Tool
Name=
"VCMIDLTool"
/>
...
...
PC/VS7.1/readme.txt
View file @
fa2c61a2
...
...
@@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
python
26
.{dll, lib} in Release mode)
python
33
.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.
...
...
@@ -26,7 +26,7 @@ The proper order to build subprojects:
test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
their name: python
26
_d.dll, python_d.exe, parser_d.pyd, and so on.
their name: python
33
_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS
-----------
...
...
PC/VS8.0/build_ssl.bat
View file @
fa2c61a2
...
...
@@ -2,10 +2,10 @@
if
not
defined
HOST_PYTHON
(
if
%
1
EQU
Debug
(
set
HOST_PYTHON
=
python_d
.exe
if
not
exist
python3
2
_d
.dll
exit
1
if
not
exist
python3
3
_d
.dll
exit
1
)
ELSE
(
set
HOST_PYTHON
=
python
.exe
if
not
exist
python3
2
.dll
exit
1
if
not
exist
python3
3
.dll
exit
1
)
)
%HOST_PYTHON%
build_ssl
.py
%
1
%
2
%
3
...
...
PC/VS8.0/kill_python.c
View file @
fa2c61a2
...
...
@@ -106,7 +106,7 @@ main(int argc, char **argv)
/*
* XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python3
2
[_d].dll),
* and see if any of our DLLs are loaded (i.e. python3
3
[_d].dll),
* as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient.
...
...
PC/VS8.0/pyproject.vsprops
View file @
fa2c61a2
...
...
@@ -38,7 +38,7 @@
/>
<UserMacro
Name=
"PyDllName"
Value=
"python3
2
"
Value=
"python3
3
"
/>
<UserMacro
Name=
"PythonExe"
...
...
PC/example_nt/example.vcproj
View file @
fa2c61a2
...
...
@@ -39,7 +39,7 @@
<Tool
Name=
"VCLinkerTool"
AdditionalOptions=
"/export:initexample"
AdditionalDependencies=
"odbc32.lib odbccp32.lib python
26
.lib"
AdditionalDependencies=
"odbc32.lib odbccp32.lib python
33
.lib"
OutputFile=
".\Release/example.pyd"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
...
...
@@ -105,7 +105,7 @@
<Tool
Name=
"VCLinkerTool"
AdditionalOptions=
"/export:initexample"
AdditionalDependencies=
"odbc32.lib odbccp32.lib python
26
_d.lib"
AdditionalDependencies=
"odbc32.lib odbccp32.lib python
33
_d.lib"
OutputFile=
".\Debug/example_d.pyd"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
...
...
PC/os2emx/Makefile
View file @
fa2c61a2
...
...
@@ -237,7 +237,7 @@ $(OUT)%$O: %.c
# Output file names
PYTHON_VER
=
2.6
PYTHON_LIB
=
python
26
PYTHON_LIB
=
python
33
PYTHON.LIB
=
$(PYTHON_LIB)
_s
$A
PYTHON.IMPLIB
=
$(PYTHON_LIB)$A
ifeq
($(EXEOMF),yes)
...
...
PC/os2emx/README.os2emx
View file @
fa2c61a2
...
...
@@ -305,7 +305,7 @@ Procedure
to be installed in a directory other than the PYTHONHOME directory, set
the value of the Makefile variable EXE_DIR to the appropriate directory.
3. If you wish the Python core DLL (python
26
.dll) to be installed in a
3. If you wish the Python core DLL (python
33
.dll) to be installed in a
directory other than the directory in which the Python executables are
installed (by default, the PYTHONHOME directory), set the value of the
Makefile variable DLL_DIR to the appropriate directory. This DLL must
...
...
PC/os2emx/python
27
.def
→
PC/os2emx/python
33
.def
View file @
fa2c61a2
This diff is collapsed.
Click to expand it.
PC/pyconfig.h
View file @
fa2c61a2
...
...
@@ -319,11 +319,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
their Makefile (other compilers are generally
taken care of by distutils.) */
# if defined(_DEBUG)
# pragma comment(lib,"python3
2
_d.lib")
# pragma comment(lib,"python3
3
_d.lib")
# elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib")
# else
# pragma comment(lib,"python3
2
.lib")
# pragma comment(lib,"python3
3
.lib")
# endif
/* _DEBUG */
# endif
/* _MSC_VER */
# endif
/* Py_BUILD_CORE */
...
...
PC/python3.def
View file @
fa2c61a2
This diff is collapsed.
Click to expand it.
PC/python3.mak
View file @
fa2c61a2
$(OutDir)python3
2.dll
:
python3.def $(OutDir)python32
stub.lib
cl /LD /Fe
$(OutDir)
python3.dll python3dll.c python3.def
$(OutDir)
python3
2
stub.lib
$(OutDir)python3
3.dll
:
python3.def $(OutDir)python33
stub.lib
cl /LD /Fe
$(OutDir)
python3.dll python3dll.c python3.def
$(OutDir)
python3
3
stub.lib
$(OutDir)python3
2stub.lib
:
python32
stub.def
lib /def:python3
2stub.def /out:
$(OutDir)
python32
stub.lib /MACHINE:
$(MACHINE)
$(OutDir)python3
3stub.lib
:
python33
stub.def
lib /def:python3
3stub.def /out:
$(OutDir)
python33
stub.lib /MACHINE:
$(MACHINE)
clean
:
del
$(OutDir)
python3.dll
$(OutDir)
python3.lib
$(OutDir)
python3
2stub.lib
$(OutDir)
python3.exp
$(OutDir)
python32
stub.exp
del
$(OutDir)
python3.dll
$(OutDir)
python3.lib
$(OutDir)
python3
3stub.lib
$(OutDir)
python3.exp
$(OutDir)
python33
stub.exp
rebuild
:
clean $(OutDir)python3
2
.dll
rebuild
:
clean $(OutDir)python3
3
.dll
PC/python3
2
gen.py
→
PC/python3
3
gen.py
View file @
fa2c61a2
# Generate python3
2
stub.def out of python3.def
# Generate python3
3
stub.def out of python3.def
# The regular import library cannot be used,
# since it doesn't provide the right symbols for
# data forwarding
out
=
open
(
"python3
2
stub.def"
,
"w"
)
out
.
write
(
'LIBRARY "python3
2
"
\
n
'
)
out
=
open
(
"python3
3
stub.def"
,
"w"
)
out
.
write
(
'LIBRARY "python3
3
"
\
n
'
)
out
.
write
(
'EXPORTS
\
n
'
)
inp
=
open
(
"python3.def"
)
...
...
@@ -12,7 +12,7 @@ line = inp.readline()
assert
line
.
strip
()
==
'EXPORTS'
for
line
in
inp
:
# SYM1=python3
2
.SYM2[ DATA]
# SYM1=python3
3
.SYM2[ DATA]
head
,
tail
=
line
.
split
(
'.'
)
if
'DATA'
in
tail
:
symbol
,
tail
=
tail
.
split
(
' '
)
...
...
PC/python3
2
stub.def
→
PC/python3
3
stub.def
View file @
fa2c61a2
LIBRARY "python3
2
"
LIBRARY "python3
3
"
EXPORTS
PyArg_Parse
PyArg_ParseTuple
...
...
PCbuild/build_ssl.bat
View file @
fa2c61a2
...
...
@@ -2,10 +2,10 @@
if
not
defined
HOST_PYTHON
(
if
%
1
EQU
Debug
(
set
HOST_PYTHON
=
python_d
.exe
if
not
exist
python3
1
_d
.dll
exit
1
if
not
exist
python3
3
_d
.dll
exit
1
)
ELSE
(
set
HOST_PYTHON
=
python
.exe
if
not
exist
python3
1
.dll
exit
1
if
not
exist
python3
3
.dll
exit
1
)
)
%HOST_PYTHON%
build_ssl
.py
%
1
%
2
%
3
...
...
PCbuild/kill_python.c
View file @
fa2c61a2
...
...
@@ -106,7 +106,7 @@ main(int argc, char **argv)
/*
* XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python3
2
[_d].dll),
* and see if any of our DLLs are loaded (i.e. python3
3
[_d].dll),
* as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient.
...
...
PCbuild/pyproject.vsprops
View file @
fa2c61a2
...
...
@@ -38,7 +38,7 @@
/>
<UserMacro
Name=
"PyDllName"
Value=
"python3
2
"
Value=
"python3
3
"
/>
<UserMacro
Name=
"PythonExe"
...
...
PCbuild/readme.txt
View file @
fa2c61a2
...
...
@@ -37,7 +37,7 @@ NOTE:
running a Python core buildbot test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
their name: python3
2
_d.dll, python_d.exe, parser_d.pyd, and so on. Both
their name: python3
3
_d.dll, python_d.exe, parser_d.pyd, and so on. Both
the build and rt batch files accept a -d option for debug builds.
The 32bit builds end up in the solution folder PCbuild while the x64 builds
...
...
README
View file @
fa2c61a2
...
...
@@ -50,9 +50,9 @@ What's New
----------
We try to have a comprehensive overview of the changes in the "What's New in
Python 3.
2
" document, found at
Python 3.
3
" document, found at
http://docs.python.org/3.
2/whatsnew/3.2
.html
http://docs.python.org/3.
3/whatsnew/3.3
.html
For a more detailed change log, read Misc/NEWS (though this file, too, is
incomplete, and also doesn't list anything merged in from the 2.7 release under
...
...
@@ -65,9 +65,9 @@ entitled "Installing multiple versions".
Documentation
-------------
Documentation for Python 3.
2
is online, updated daily:
Documentation for Python 3.
3
is online, updated daily:
http://docs.python.org/3.
2
/
http://docs.python.org/3.
3
/
It can also be downloaded in many formats for faster access. The documentation
is downloadable in HTML, PDF, and reStructuredText formats; the latter version
...
...
@@ -85,7 +85,7 @@ backported versions of certain key Python 3.x features.
A source-to-source translation tool, "2to3", can take care of the mundane task
of converting large amounts of source code. It is not a complete solution but
is complemented by the deprecation warnings in 2.6. See
http://docs.python.org/3.
2
/library/2to3.html for more information.
http://docs.python.org/3.
3
/library/2to3.html for more information.
Testing
...
...
@@ -125,8 +125,8 @@ same prefix you must decide which version (if any) is your "primary" version.
Install that version using "make install". Install all other versions using
"make altinstall".
For example, if you want to install Python 2.
5, 2.6 and 3.2 with 2.6
being the
primary version, you would execute "make install" in your 2.
6
build directory
For example, if you want to install Python 2.
6, 2.7 and 3.3 with 2.7
being the
primary version, you would execute "make install" in your 2.
7
build directory
and "make altinstall" in the others.
...
...
@@ -161,7 +161,7 @@ http://www.python.org/dev/peps/.
Release Schedule
----------------
See PEP
392 for release details: http://www.python.org/dev/peps/pep-0392
/
See PEP
XXX for release details: http://www.python.org/dev/peps/pep-0XXX
/
Copyright and License Information
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment