More automated version replacement.

This commit is contained in:
Georg Brandl 2011-02-20 10:41:31 +00:00
parent 3ebb6b3615
commit fa2c61a222
21 changed files with 864 additions and 864 deletions

View File

@ -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:"./python32.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:"./python33.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:"./python32_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:"./python33_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF

View File

@ -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,
python32.{dll, lib} in Release mode)
python33.{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: python32_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
their name: python33_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
SUBPROJECTS
-----------

View File

@ -39,15 +39,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
@ -99,15 +99,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32_d.dll"
OutputFile="./python33_d.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32_d.pdb"
ProgramDatabaseFile=".\./python33_d.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32_d.lib"
ImportLibrary=".\./python33_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
@ -166,15 +166,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>
@ -233,15 +233,15 @@
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o"
OutputFile="./python32.dll"
OutputFile="./python33.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python32.pdb"
ProgramDatabaseFile=".\./python33.pdb"
SubSystem="2"
BaseAddress="0x1e000000"
ImportLibrary=".\./python32.lib"
ImportLibrary=".\./python33.lib"
TargetMachine="0"/>
<Tool
Name="VCMIDLTool"/>

View File

@ -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,
python26.{dll, lib} in Release mode)
python33.{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: python26_d.dll, python_d.exe, parser_d.pyd, and so on.
their name: python33_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS
-----------

View File

@ -2,10 +2,10 @@
if not defined HOST_PYTHON (
if %1 EQU Debug (
set HOST_PYTHON=python_d.exe
if not exist python32_d.dll exit 1
if not exist python33_d.dll exit 1
) ELSE (
set HOST_PYTHON=python.exe
if not exist python32.dll exit 1
if not exist python33.dll exit 1
)
)
%HOST_PYTHON% build_ssl.py %1 %2 %3

View File

@ -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. python32[_d].dll),
* and see if any of our DLLs are loaded (i.e. python33[_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.

View File

@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
Value="python32"
Value="python33"
/>
<UserMacro
Name="PythonExe"

View File

@ -39,7 +39,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python33.lib"
OutputFile=".\Release/example.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@ -105,7 +105,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python26_d.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python33_d.lib"
OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"

View File

@ -237,7 +237,7 @@ $(OUT)%$O: %.c
# Output file names
PYTHON_VER= 2.6
PYTHON_LIB= python26
PYTHON_LIB= python33
PYTHON.LIB= $(PYTHON_LIB)_s$A
PYTHON.IMPLIB= $(PYTHON_LIB)$A
ifeq ($(EXEOMF),yes)

View File

@ -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 (python26.dll) to be installed in a
3. If you wish the Python core DLL (python33.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

View File

@ -1,72 +1,72 @@
LIBRARY python26 INITINSTANCE TERMINSTANCE
LIBRARY python33 INITINSTANCE TERMINSTANCE
DESCRIPTION "Python 2.6 Core DLL"
PROTMODE
DATA MULTIPLE NONSHARED
EXPORTS
; From python26_s.lib(config)
; From python33_s.lib(config)
"_PyImport_Inittab"
; From python26_s.lib(dlfcn)
; From python33_s.lib(dlfcn)
; "dlopen"
; "dlsym"
; "dlclose"
; "dlerror"
; From python26_s.lib(getpathp)
; From python33_s.lib(getpathp)
"Py_GetProgramFullPath"
"Py_GetPrefix"
"Py_GetExecPrefix"
"Py_GetPath"
; From python26_s.lib(getbuildinfo)
; From python33_s.lib(getbuildinfo)
"Py_GetBuildInfo"
"_Py_svnversion"
; From python26_s.lib(main)
; From python33_s.lib(main)
"Py_Main"
"Py_GetArgcArgv"
; From python26_s.lib(acceler)
; From python33_s.lib(acceler)
"PyGrammar_AddAccelerators"
"PyGrammar_RemoveAccelerators"
; From python26_s.lib(grammar1)
; From python33_s.lib(grammar1)
"PyGrammar_FindDFA"
"PyGrammar_LabelRepr"
; From python26_s.lib(listnode)
; From python33_s.lib(listnode)
"PyNode_ListTree"
; From python26_s.lib(node)
; From python33_s.lib(node)
"PyNode_New"
"PyNode_AddChild"
"PyNode_Free"
; From python26_s.lib(parser)
; From python33_s.lib(parser)
"PyParser_AddToken"
"PyParser_New"
"PyParser_Delete"
; From python26_s.lib(parsetok)
; From python33_s.lib(parsetok)
"PyParser_ParseString"
"PyParser_ParseStringFlagsFilename"
"PyParser_ParseFile"
"PyParser_ParseFileFlags"
"PyParser_ParseStringFlags"
; From python26_s.lib(bitset)
; From python33_s.lib(bitset)
"_Py_newbitset"
"_Py_delbitset"
"_Py_addbit"
"_Py_samebitset"
"_Py_mergebitset"
; From python26_s.lib(metagrammar)
; From python33_s.lib(metagrammar)
"_Py_meta_grammar"
"Py_meta_grammar"
; From python26_s.lib(tokenizer)
; From python33_s.lib(tokenizer)
"PyToken_OneChar"
"PyToken_TwoChars"
"PyToken_ThreeChars"
@ -76,14 +76,14 @@ EXPORTS
"PyTokenizer_Get"
"_PyParser_TokenNames"
; From python26_s.lib(myreadline)
; From python33_s.lib(myreadline)
"_PyOS_ReadlineTState"
"PyOS_ReadlineFunctionPointer"
"PyOS_StdioReadline"
"PyOS_Readline"
"PyOS_InputHook"
; From python26_s.lib(abstract)
; From python33_s.lib(abstract)
"_PyObject_LengthHint"
"PyMapping_Size"
"PyObject_CallMethod"
@ -174,13 +174,13 @@ EXPORTS
"PyObject_IsInstance"
"PyObject_IsSubclass"
; From python26_s.lib(boolobject)
; From python33_s.lib(boolobject)
"PyBool_FromLong"
"PyBool_Type"
"_Py_ZeroStruct"
"_Py_TrueStruct"
; From python26_s.lib(bufferobject)
; From python33_s.lib(bufferobject)
"PyBuffer_FromObject"
"PyBuffer_FromReadWriteObject"
"PyBuffer_FromMemory"
@ -188,13 +188,13 @@ EXPORTS
"PyBuffer_New"
"PyBuffer_Type"
; From python26_s.lib(cellobject)
; From python33_s.lib(cellobject)
"PyCell_New"
"PyCell_Get"
"PyCell_Set"
"PyCell_Type"
; From python26_s.lib(classobject)
; From python33_s.lib(classobject)
"PyClass_New"
"PyClass_IsSubclass"
"PyInstance_New"
@ -209,7 +209,7 @@ EXPORTS
"PyInstance_Type"
"PyMethod_Type"
; From python26_s.lib(capsule)
; From python33_s.lib(capsule)
"PyCapsule_GetContext"
"PyCapsule_GetDestructor"
"PyCapsule_GetName"
@ -222,7 +222,7 @@ EXPORTS
"PyCapsule_SetName"
"PyCapsule_SetPointer"
; From python26_s.lib(cobject)
; From python33_s.lib(cobject)
"PyCObject_FromVoidPtr"
"PyCObject_FromVoidPtrAndDesc"
"PyCObject_AsVoidPtr"
@ -231,13 +231,13 @@ EXPORTS
"PyCObject_SetVoidPtr"
"PyCObject_Type"
; From python26_s.lib(codeobject)
; From python33_s.lib(codeobject)
"PyCode_New"
"PyCode_Addr2Line"
"PyCode_CheckLineNumber"
"PyCode_Type"
; From python26_s.lib(complexobject)
; From python33_s.lib(complexobject)
"_Py_c_pow"
"_Py_c_sum"
"_Py_c_diff"
@ -251,7 +251,7 @@ EXPORTS
"PyComplex_AsCComplex"
"PyComplex_Type"
; From python26_s.lib(descrobject)
; From python33_s.lib(descrobject)
"PyWrapper_New"
"PyDescr_NewMethod"
"PyDescr_NewClassMethod"
@ -262,7 +262,7 @@ EXPORTS
"PyWrapperDescr_Type"
"PyProperty_Type"
; From python26_s.lib(dictobject)
; From python33_s.lib(dictobject)
"PyDict_New"
"PyDict_GetItem"
"PyDict_SetItem"
@ -286,11 +286,11 @@ EXPORTS
"PyDictIterValue_Type"
"PyDictIterItem_Type"
; From python26_s.lib(enumobject)
; From python33_s.lib(enumobject)
"PyEnum_Type"
"PyReversed_Type"
; From python26_s.lib(fileobject)
; From python33_s.lib(fileobject)
"PyFile_FromString"
"Py_UniversalNewlineFread"
"PyFile_GetLine"
@ -306,7 +306,7 @@ EXPORTS
"PyFile_Name"
"PyFile_Type"
; From python26_s.lib(floatobject)
; From python33_s.lib(floatobject)
"PyFloat_FromString"
"PyFloat_AsDouble"
"PyFloat_Fini"
@ -321,7 +321,7 @@ EXPORTS
"PyFloat_AsStringEx"
"PyFloat_Type"
; From python26_s.lib(frameobject)
; From python33_s.lib(frameobject)
"PyFrame_New"
"PyFrame_FastToLocals"
"PyFrame_LocalsToFast"
@ -331,7 +331,7 @@ EXPORTS
"PyFrame_BlockPop"
"PyFrame_Type"
; From python26_s.lib(funcobject)
; From python33_s.lib(funcobject)
"PyFunction_New"
"PyFunction_GetCode"
"PyFunction_GetGlobals"
@ -346,12 +346,12 @@ EXPORTS
"PyClassMethod_Type"
"PyStaticMethod_Type"
; From python26_s.lib(genobject)
; From python33_s.lib(genobject)
"PyGen_New"
"PyGen_NeedsFinalizing"
"PyGen_Type"
; From python26_s.lib(intobject)
; From python33_s.lib(intobject)
"PyInt_AsLong"
"PyInt_AsUnsignedLongMask"
"PyInt_AsUnsignedLongLongMask"
@ -366,13 +366,13 @@ EXPORTS
"_PyInt_Init"
"PyInt_Type"
; From python26_s.lib(iterobject)
; From python33_s.lib(iterobject)
"PySeqIter_New"
"PyCallIter_New"
"PySeqIter_Type"
"PyCallIter_Type"
; From python26_s.lib(listobject)
; From python33_s.lib(listobject)
"PyList_New"
"PyList_Append"
"PyList_Size"
@ -390,7 +390,7 @@ EXPORTS
"PyListIter_Type"
"PyListRevIter_Type"
; From python26_s.lib(longobject)
; From python33_s.lib(longobject)
"PyLong_FromDouble"
"PyLong_AsLong"
"_PyLong_AsSsize_t"
@ -420,7 +420,7 @@ EXPORTS
"PyLong_Type"
"_PyLong_DigitValue"
; From python26_s.lib(methodobject)
; From python33_s.lib(methodobject)
"PyCFunction_Call"
"Py_FindMethodInChain"
"PyCFunction_GetFunction"
@ -432,7 +432,7 @@ EXPORTS
"PyCFunction_New"
"PyCFunction_Type"
; From python26_s.lib(moduleobject)
; From python33_s.lib(moduleobject)
"PyModule_New"
"_PyModule_Clear"
"PyModule_GetDict"
@ -440,7 +440,7 @@ EXPORTS
"PyModule_GetFilename"
"PyModule_Type"
; From python26_s.lib(object)
; From python33_s.lib(object)
"Py_DivisionWarningFlag"
"PyObject_Str"
"PyObject_Repr"
@ -493,15 +493,15 @@ EXPORTS
"_PyTrash_delete_nesting"
"_PyTrash_delete_later"
; From python26_s.lib(obmalloc)
; From python33_s.lib(obmalloc)
"PyObject_Malloc"
"PyObject_Free"
"PyObject_Realloc"
; From python26_s.lib(rangeobject)
; From python33_s.lib(rangeobject)
"PyRange_Type"
; From python26_s.lib(setobject)
; From python33_s.lib(setobject)
"PySet_Pop"
"PySet_New"
"PyFrozenSet_New"
@ -516,7 +516,7 @@ EXPORTS
"PySet_Type"
"PyFrozenSet_Type"
; From python26_s.lib(sliceobject)
; From python33_s.lib(sliceobject)
"_PySlice_FromIndices"
"PySlice_GetIndices"
"PySlice_GetIndicesEx"
@ -524,7 +524,7 @@ EXPORTS
"_Py_EllipsisObject"
"PySlice_Type"
; From python26_s.lib(stringobject)
; From python33_s.lib(stringobject)
"PyString_FromStringAndSize"
"PyString_InternInPlace"
"PyString_FromString"
@ -555,12 +555,12 @@ EXPORTS
"PyString_Type"
"PyBaseString_Type"
; From python26_s.lib(structseq)
; From python33_s.lib(structseq)
"PyStructSequence_InitType"
"PyStructSequence_New"
"PyStructSequence_UnnamedField"
; From python26_s.lib(tupleobject)
; From python33_s.lib(tupleobject)
"PyTuple_New"
"PyTuple_Pack"
"_PyTuple_Resize"
@ -572,7 +572,7 @@ EXPORTS
"PyTuple_Type"
"PyTupleIter_Type"
; From python26_s.lib(typeobject)
; From python33_s.lib(typeobject)
"PyType_IsSubtype"
"_PyType_Lookup"
"PyType_Ready"
@ -583,7 +583,7 @@ EXPORTS
"PyBaseObject_Type"
"PySuper_Type"
; From python26_s.lib(unicodeobject)
; From python33_s.lib(unicodeobject)
"PyUnicodeUCS2_Resize"
"PyUnicodeUCS2_FromOrdinal"
"PyUnicodeUCS2_FromObject"
@ -649,7 +649,7 @@ EXPORTS
"PyUnicode_AsDecodedObject"
"PyUnicode_Type"
; From python26_s.lib(unicodectype)
; From python33_s.lib(unicodectype)
"_PyUnicode_TypeRecords"
"_PyUnicodeUCS2_ToNumeric"
"_PyUnicodeUCS2_IsLowercase"
@ -667,7 +667,7 @@ EXPORTS
"_PyUnicodeUCS2_IsNumeric"
"_PyUnicodeUCS2_IsAlpha"
; From python26_s.lib(weakrefobject)
; From python33_s.lib(weakrefobject)
"PyWeakref_NewRef"
"PyWeakref_NewProxy"
"PyObject_ClearWeakRefs"
@ -678,7 +678,7 @@ EXPORTS
"_PyWeakref_ProxyType"
"_PyWeakref_CallableProxyType"
; From python26_s.lib(Python-ast)
; From python33_s.lib(Python-ast)
; "init_ast"
"Module"
"Interactive"
@ -737,18 +737,18 @@ EXPORTS
"alias"
"PyAST_mod2obj"
; From python26_s.lib(asdl)
; From python33_s.lib(asdl)
"asdl_seq_new"
"asdl_int_seq_new"
; From python26_s.lib(ast)
; From python33_s.lib(ast)
"PyAST_FromNode"
; From python26_s.lib(bltinmodule)
; From python33_s.lib(bltinmodule)
"_PyBuiltin_Init"
"Py_FileSystemDefaultEncoding"
; From python26_s.lib(exceptions)
; From python33_s.lib(exceptions)
"PyUnicodeEncodeError_GetStart"
"PyUnicodeDecodeError_GetStart"
"PyUnicodeEncodeError_GetEnd"
@ -824,7 +824,7 @@ EXPORTS
"PyExc_ImportWarning"
"PyExc_MemoryErrorInst"
; From python26_s.lib(ceval)
; From python33_s.lib(ceval)
"PyEval_EvalFrameEx"
"PyEval_CallObjectWithKeywords"
"PyEval_EvalCodeEx"
@ -863,13 +863,13 @@ EXPORTS
"_Py_CheckInterval"
"_Py_Ticker"
; From python26_s.lib(compile)
; From python33_s.lib(compile)
"_Py_Mangle"
"PyAST_Compile"
"PyNode_Compile"
"Py_OptimizeFlag"
; From python26_s.lib(codecs)
; From python33_s.lib(codecs)
"_PyCodec_Lookup"
"PyCodec_Encode"
"PyCodec_Decode"
@ -888,7 +888,7 @@ EXPORTS
"PyCodec_LookupError"
"PyCodec_StrictErrors"
; From python26_s.lib(errors)
; From python33_s.lib(errors)
"PyErr_SetNone"
"PyErr_SetString"
"PyErr_GivenExceptionMatches"
@ -914,16 +914,16 @@ EXPORTS
"PyErr_Warn"
"PyErr_WarnExplicit"
; From python26_s.lib(frozen)
; From python33_s.lib(frozen)
"PyImport_FrozenModules"
; From python26_s.lib(frozenmain)
; From python33_s.lib(frozenmain)
"Py_FrozenMain"
; From python26_s.lib(future)
; From python33_s.lib(future)
"PyFuture_FromAST"
; From python26_s.lib(getargs)
; From python33_s.lib(getargs)
"PyArg_Parse"
"_PyArg_Parse_SizeT"
"PyArg_ParseTuple"
@ -937,22 +937,22 @@ EXPORTS
"_PyArg_VaParse_SizeT"
"_PyArg_VaParseTupleAndKeywords_SizeT"
; From python26_s.lib(getcompiler)
; From python33_s.lib(getcompiler)
"Py_GetCompiler"
; From python26_s.lib(getcopyright)
; From python33_s.lib(getcopyright)
"Py_GetCopyright"
; From python26_s.lib(getplatform)
; From python33_s.lib(getplatform)
"Py_GetPlatform"
; From python26_s.lib(getversion)
; From python33_s.lib(getversion)
"Py_GetVersion"
; From python26_s.lib(graminit)
; From python33_s.lib(graminit)
"_PyParser_Grammar"
; From python26_s.lib(import)
; From python33_s.lib(import)
"_PyImport_Init"
"_PyImportHooks_Init"
"PyImport_ImportModule"
@ -979,10 +979,10 @@ EXPORTS
"PyImport_Inittab"
"_PyImport_Filetab"
; From python26_s.lib(importdl)
; From python33_s.lib(importdl)
"_PyImport_LoadDynamicModule"
; From python26_s.lib(marshal)
; From python33_s.lib(marshal)
"PyMarshal_ReadLongFromFile"
"PyMarshal_WriteObjectToString"
"PyMarshal_WriteLongToFile"
@ -993,7 +993,7 @@ EXPORTS
"PyMarshal_ReadObjectFromString"
"PyMarshal_Init"
; From python26_s.lib(modsupport)
; From python33_s.lib(modsupport)
"Py_InitModule4"
"Py_BuildValue"
"_Py_BuildValue_SizeT"
@ -1006,24 +1006,24 @@ EXPORTS
"PyModule_AddStringConstant"
"_Py_PackageContext"
; From python26_s.lib(mysnprintf)
; From python33_s.lib(mysnprintf)
"PyOS_snprintf"
"PyOS_vsnprintf"
; From python26_s.lib(mystrtoul)
; From python33_s.lib(mystrtoul)
"PyOS_strtoul"
"PyOS_strtol"
; From python26_s.lib(pyarena)
; From python33_s.lib(pyarena)
"PyArena_New"
"PyArena_Free"
"PyArena_Malloc"
"PyArena_AddPyObject"
; From python26_s.lib(pyfpe)
; From python33_s.lib(pyfpe)
"PyFPE_dummy"
; From python26_s.lib(pystate)
; From python33_s.lib(pystate)
"PyInterpreterState_Clear"
"PyThreadState_Clear"
"_PyThread_CurrentFrames"
@ -1048,7 +1048,7 @@ EXPORTS
"_PyThreadState_Current"
"_PyThreadState_GetFrame"
; From python26_s.lib(pythonrun)
; From python33_s.lib(pythonrun)
"Py_IgnoreEnvironmentFlag"
"Py_DebugFlag"
"Py_VerboseFlag"
@ -1110,20 +1110,20 @@ EXPORTS
"Py_UnicodeFlag"
"_Py_QnewFlag"
; From python26_s.lib(structmember)
; From python33_s.lib(structmember)
"PyMember_Get"
"PyMember_GetOne"
"PyMember_SetOne"
"PyMember_Set"
; From python26_s.lib(symtable)
; From python33_s.lib(symtable)
"PySymtable_Build"
"PySymtable_Free"
"PyST_GetScope"
"PySymtable_Lookup"
"PySTEntry_Type"
; From python26_s.lib(sysmodule)
; From python33_s.lib(sysmodule)
"_PySys_Init"
"PySys_WriteStderr"
"PySys_SetPath"
@ -1137,22 +1137,22 @@ EXPORTS
"PySys_ResetWarnOptions"
"PySys_AddWarnOption"
; From python26_s.lib(traceback)
; From python33_s.lib(traceback)
"PyTraceBack_Here"
"PyTraceBack_Print"
"PyTraceBack_Type"
; From python26_s.lib(getopt)
; From python33_s.lib(getopt)
"_PyOS_GetOpt"
"_PyOS_opterr"
"_PyOS_optind"
"_PyOS_optarg"
; From python26_s.lib(dynload_shlib)
; From python33_s.lib(dynload_shlib)
"_PyImport_DynLoadFiletab"
"_PyImport_GetDynLoadFunc"
; From python26_s.lib(thread)
; From python33_s.lib(thread)
"PyThread_delete_key_value"
"PyThread_init_thread"
"PyThread_start_new_thread"
@ -1169,7 +1169,7 @@ EXPORTS
"PyThread_set_key_value"
"PyThread_get_key_value"
; From python26_s.lib(gcmodule)
; From python33_s.lib(gcmodule)
; "initgc"
"_PyObject_GC_New"
"_PyObject_GC_NewVar"
@ -1185,7 +1185,7 @@ EXPORTS
"_PyObject_GC_Del"
"_PyGC_generation0"
; From python26_s.lib(signalmodule)
; From python33_s.lib(signalmodule)
; "initsignal"
"PyErr_CheckSignals"
"PyErr_SetInterrupt"
@ -1194,121 +1194,121 @@ EXPORTS
"PyOS_InitInterrupts"
"PyOS_AfterFork"
; From python26_s.lib(posixmodule)
; From python33_s.lib(posixmodule)
; "initos2"
; From python26_s.lib(_threadmodule)
; From python33_s.lib(_threadmodule)
; "init_thread"
; From python26_s.lib(arraymodule)
; From python33_s.lib(arraymodule)
; "initarray"
; "array_methods"
; From python26_s.lib(binascii)
; From python33_s.lib(binascii)
; "initbinascii"
; From python26_s.lib(cmathmodule)
; From python33_s.lib(cmathmodule)
; "initcmath"
; From python26_s.lib(_codecsmodule)
; From python33_s.lib(_codecsmodule)
; "init_codecs"
; From python26_s.lib(collectionsmodule)
; From python33_s.lib(collectionsmodule)
; "initcollections"
"dequeiter_type"
"dequereviter_type"
; From python26_s.lib(cPickle)
; From python33_s.lib(cPickle)
; "initcPickle"
; "fast_save_leave"
; From python26_s.lib(_csv)
; From python33_s.lib(_csv)
; "init_csv"
; From python26_s.lib(datetimemodule)
; From python33_s.lib(datetimemodule)
; "initdatetime"
; From python26_s.lib(dlmodule)
; From python33_s.lib(dlmodule)
; "initdl"
; From python26_s.lib(errnomodule)
; From python33_s.lib(errnomodule)
; "initerrno"
; From python26_s.lib(fcntlmodule)
; From python33_s.lib(fcntlmodule)
; "initfcntl"
; From python26_s.lib(_functoolsmodule)
; From python33_s.lib(_functoolsmodule)
; "init_functools"
; From python26_s.lib(_heapqmodule)
; From python33_s.lib(_heapqmodule)
; "init_heapq"
; From python26_s.lib(imageop)
; From python33_s.lib(imageop)
; "initimageop"
; From python26_s.lib(itertoolsmodule)
; From python33_s.lib(itertoolsmodule)
; "inititertools"
; From python26_s.lib(_localemodule)
; From python33_s.lib(_localemodule)
; "init_locale"
; From python26_s.lib(mathmodule)
; From python33_s.lib(mathmodule)
; "initmath"
; From python26_s.lib(md5)
; From python33_s.lib(md5)
"md5_finish"
"md5_init"
"md5_append"
; From python26_s.lib(md5module)
; From python33_s.lib(md5module)
; "init_md5"
; From python26_s.lib(operator)
; From python33_s.lib(operator)
; "initoperator"
; From python26_s.lib(_randommodule)
; From python33_s.lib(_randommodule)
; "init_random"
; From python26_s.lib(rgbimgmodule)
; From python33_s.lib(rgbimgmodule)
; "initrgbimg"
; From python26_s.lib(shamodule)
; From python33_s.lib(shamodule)
; "init_sha"
; From python26_s.lib(sha256module)
; From python33_s.lib(sha256module)
; "init_sha256"
; From python26_s.lib(sha512module)
; From python33_s.lib(sha512module)
; "init_sha512"
; From python26_s.lib(_sre)
; From python33_s.lib(_sre)
; "init_sre"
; From python26_s.lib(stropmodule)
; From python33_s.lib(stropmodule)
; "initstrop"
; From python26_s.lib(_struct)
; From python33_s.lib(_struct)
; "init_struct"
; From python26_s.lib(symtablemodule)
; From python33_s.lib(symtablemodule)
; "init_symtable"
; From python26_s.lib(termios)
; From python33_s.lib(termios)
; "inittermios"
; From python26_s.lib(timemodule)
; From python33_s.lib(timemodule)
; "inittime"
"_PyTime_DoubleToTimet"
; "inittimezone"
; From python26_s.lib(timingmodule)
; From python33_s.lib(timingmodule)
; "inittiming"
; From python26_s.lib(_weakref)
; From python33_s.lib(_weakref)
; "init_weakref"
; From python26_s.lib(xxsubtype)
; From python33_s.lib(xxsubtype)
; "initxxsubtype"
; From python26_s.lib(zipimport)
; From python33_s.lib(zipimport)
; "initzipimport"

View File

@ -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,"python32_d.lib")
# pragma comment(lib,"python33_d.lib")
# elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib")
# else
# pragma comment(lib,"python32.lib")
# pragma comment(lib,"python33.lib")
# endif /* _DEBUG */
# endif /* _MSC_VER */
# endif /* Py_BUILD_CORE */

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
$(OutDir)python32.dll: python3.def $(OutDir)python32stub.lib
cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python32stub.lib
$(OutDir)python33.dll: python3.def $(OutDir)python33stub.lib
cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib
$(OutDir)python32stub.lib: python32stub.def
lib /def:python32stub.def /out:$(OutDir)python32stub.lib /MACHINE:$(MACHINE)
$(OutDir)python33stub.lib: python33stub.def
lib /def:python33stub.def /out:$(OutDir)python33stub.lib /MACHINE:$(MACHINE)
clean:
del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python32stub.lib $(OutDir)python3.exp $(OutDir)python32stub.exp
del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp
rebuild: clean $(OutDir)python32.dll
rebuild: clean $(OutDir)python33.dll

View File

@ -1,9 +1,9 @@
# Generate python32stub.def out of python3.def
# Generate python33stub.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("python32stub.def", "w")
out.write('LIBRARY "python32"\n')
out = open("python33stub.def", "w")
out.write('LIBRARY "python33"\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=python32.SYM2[ DATA]
# SYM1=python33.SYM2[ DATA]
head, tail = line.split('.')
if 'DATA' in tail:
symbol, tail = tail.split(' ')

View File

@ -1,4 +1,4 @@
LIBRARY "python32"
LIBRARY "python33"
EXPORTS
PyArg_Parse
PyArg_ParseTuple

View File

@ -2,10 +2,10 @@
if not defined HOST_PYTHON (
if %1 EQU Debug (
set HOST_PYTHON=python_d.exe
if not exist python31_d.dll exit 1
if not exist python33_d.dll exit 1
) ELSE (
set HOST_PYTHON=python.exe
if not exist python31.dll exit 1
if not exist python33.dll exit 1
)
)
%HOST_PYTHON% build_ssl.py %1 %2 %3

View File

@ -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. python32[_d].dll),
* and see if any of our DLLs are loaded (i.e. python33[_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.

View File

@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
Value="python32"
Value="python33"
/>
<UserMacro
Name="PythonExe"

View File

@ -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: python32_d.dll, python_d.exe, parser_d.pyd, and so on. Both
their name: python33_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

16
README
View File

@ -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