Skip to content

C
cpython
Commit d4ec0c3e authored by Thomas Wouters's avatar Thomas Wouters
Browse files
Options

Merge with trunk up to revision 45620.

parent 13247bfc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 115 deletions
Doc/howto/unicode.rst
View file @ d4ec0c3e
...@@ -733,6 +733,7 @@ Version 1.02: posted August 16 2005. Corrects factual errors. ...@@ -733,6 +733,7 @@ Version 1.02: posted August 16 2005. Corrects factual errors.
.. comment Additional topic: building Python w/ UCS2 or UCS4 support .. comment Additional topic: building Python w/ UCS2 or UCS4 support
.. comment Describe obscure -U switch somewhere? .. comment Describe obscure -U switch somewhere?
.. comment Describe use of codecs.StreamRecoder and StreamReaderWriter
.. comment .. comment
Original outline: Original outline:
......
Doc/lib/libcodecs.tex
View file @ d4ec0c3e
This diff is collapsed.
Doc/whatsnew/whatsnew25.tex
View file @ d4ec0c3e
This diff is collapsed.
Lib/SimpleXMLRPCServer.py
View file @ d4ec0c3e
...@@ -560,6 +560,7 @@ class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher): ...@@ -560,6 +560,7 @@ class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
self.handle_xmlrpc(request_text) self.handle_xmlrpc(request_text)
if __name__ == '__main__': if __name__ == '__main__':
print 'Running XML-RPC server on port 8000'
server = SimpleXMLRPCServer(("localhost", 8000)) server = SimpleXMLRPCServer(("localhost", 8000))
server.register_function(pow) server.register_function(pow)
server.register_function(lambda x,y: x+y, 'add') server.register_function(lambda x,y: x+y, 'add')
......
Objects/stringobject.c
View file @ d4ec0c3e
...@@ -865,7 +865,7 @@ PyString_Repr(PyObject *obj, int smartquotes) ...@@ -865,7 +865,7 @@ PyString_Repr(PyObject *obj, int smartquotes)
*p++ = quote; *p++ = quote;
*p = '\0'; *p = '\0';
_PyString_Resize( _PyString_Resize(
&v, (int) (p - PyString_AS_STRING(v))); &v, (p - PyString_AS_STRING(v)));
return v; return v;
} }
} }
......
PCbuild/_bsddb.vcproj
View file @ d4ec0c3e
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;"..\..\db-4.4.20\build_win32"" AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;"..\..\db-4.4.20\build_win32"" AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_ctypes.vcproj
View file @ d4ec0c3e
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\Modules\_ctypes\libffi_msvc" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_ctypes_test.vcproj
View file @ d4ec0c3e
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="FALSE" MinimalRebuild="FALSE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_elementtree.vcproj
View file @ d4ec0c3e
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_msi.vcproj
View file @ d4ec0c3e
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_socket.vcproj
View file @ d4ec0c3e
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_sqlite3.vcproj
View file @ d4ec0c3e
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include;..\PC;..\..\sqlite-source-3.3.4" AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\"" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\"sqlite3\""
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_testcapi.vcproj
View file @ d4ec0c3e
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/_tkinter.vcproj
View file @ d4ec0c3e
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\..\tcltk\include,..\Include,..\PC" AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\..\tcltk\include,..\Include,..\PC" AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/bz2.vcproj
View file @ d4ec0c3e
...@@ -140,7 +140,7 @@ nmake /nologo /f makefile.msc lib ...@@ -140,7 +140,7 @@ nmake /nologo /f makefile.msc lib
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\bzip2-1.0.3" AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -205,7 +205,7 @@ nmake /nologo /f makefile.msc lib ...@@ -205,7 +205,7 @@ nmake /nologo /f makefile.msc lib
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\..\bzip2-1.0.3" AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/pyexpat.vcproj
View file @ d4ec0c3e
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\Modules\expat" AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/python.vcproj
View file @ d4ec0c3e
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE" AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/pythoncore.vcproj
View file @ d4ec0c3e
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
AdditionalOptions="/Zm200 /USECL:MS_OPTERON" AdditionalOptions="/Zm200 /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/pythonw.vcproj
View file @ d4ec0c3e
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/readme.txt
View file @ d4ec0c3e
...@@ -264,7 +264,7 @@ SDK, in particular the 64-bit support. This includes an Itanium compiler ...@@ -264,7 +264,7 @@ SDK, in particular the 64-bit support. This includes an Itanium compiler
In addition, you need the Visual Studio plugin for external C compilers, In addition, you need the Visual Studio plugin for external C compilers,
from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
locate the proper target compiler, and convert compiler options locate the proper target compiler, and convert compiler options
accordingly. accordingly. The project files require atleast version 0.8.
Building for AMD64 Building for AMD64
------------------ ------------------
......
PCbuild/select.vcproj
View file @ d4ec0c3e
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\select113" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\select113" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\select113" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\..\select113" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/unicodedata.vcproj
View file @ d4ec0c3e
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
PCbuild/winsound.vcproj
View file @ d4ec0c3e
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC" AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7