[Python-checkins] r53503 - python/trunk/PCbuild/_bsddb.vcproj python/trunk/PCbuild/_elementtree.vcproj python/trunk/PCbuild/_msi.vcproj python/trunk/PCbuild/_socket.vcproj python/trunk/PCbuild/_sqlite3.vcproj python/trunk/PCbuild/_ssl.mak python/trunk/PCbuild/_testcapi.vcproj python/trunk/PCbuild/_tkinter.vcproj python/trunk/PCbuild/build_ssl.py python/trunk/PCbuild/bz2.vcproj python/trunk/PCbuild/pyexpat.vcproj python/trunk/PCbuild/python.vcproj python/trunk/PCbuild/pythoncore.vcproj python/trunk/PCbuild/pythonw.vcproj python/trunk/PCbuild/select.vcproj python/trunk/PCbuild/unicodedata.vcproj python/trunk/PCbuild/winsound.vcproj
martin.v.loewis
python-checkins at python.org
Sat Jan 20 15:05:40 CET 2007
Author: martin.v.loewis
Date: Sat Jan 20 15:05:39 2007
New Revision: 53503
Modified:
python/trunk/PCbuild/_bsddb.vcproj
python/trunk/PCbuild/_elementtree.vcproj
python/trunk/PCbuild/_msi.vcproj
python/trunk/PCbuild/_socket.vcproj
python/trunk/PCbuild/_sqlite3.vcproj
python/trunk/PCbuild/_ssl.mak
python/trunk/PCbuild/_testcapi.vcproj
python/trunk/PCbuild/_tkinter.vcproj
python/trunk/PCbuild/build_ssl.py
python/trunk/PCbuild/bz2.vcproj
python/trunk/PCbuild/pyexpat.vcproj
python/trunk/PCbuild/python.vcproj
python/trunk/PCbuild/pythoncore.vcproj
python/trunk/PCbuild/pythonw.vcproj
python/trunk/PCbuild/select.vcproj
python/trunk/PCbuild/unicodedata.vcproj
python/trunk/PCbuild/winsound.vcproj
Log:
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
Modified: python/trunk/PCbuild/_bsddb.vcproj
==============================================================================
--- python/trunk/PCbuild/_bsddb.vcproj (original)
+++ python/trunk/PCbuild/_bsddb.vcproj Sat Jan 20 15:05:39 2007
@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;"..\..\db-4.4.20\build_win32""
Modified: python/trunk/PCbuild/_elementtree.vcproj
==============================================================================
--- python/trunk/PCbuild/_elementtree.vcproj (original)
+++ python/trunk/PCbuild/_elementtree.vcproj Sat Jan 20 15:05:39 2007
@@ -129,7 +129,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
Modified: python/trunk/PCbuild/_msi.vcproj
==============================================================================
--- python/trunk/PCbuild/_msi.vcproj (original)
+++ python/trunk/PCbuild/_msi.vcproj Sat Jan 20 15:05:39 2007
@@ -129,7 +129,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
@@ -150,7 +150,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
+ AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib"
OutputFile="./_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
Modified: python/trunk/PCbuild/_socket.vcproj
==============================================================================
--- python/trunk/PCbuild/_socket.vcproj (original)
+++ python/trunk/PCbuild/_socket.vcproj Sat Jan 20 15:05:39 2007
@@ -128,7 +128,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/_sqlite3.vcproj
==============================================================================
--- python/trunk/PCbuild/_sqlite3.vcproj (original)
+++ python/trunk/PCbuild/_sqlite3.vcproj Sat Jan 20 15:05:39 2007
@@ -131,7 +131,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
@@ -193,7 +193,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
Modified: python/trunk/PCbuild/_ssl.mak
==============================================================================
--- python/trunk/PCbuild/_ssl.mak (original)
+++ python/trunk/PCbuild/_ssl.mak Sat Jan 20 15:05:39 2007
@@ -31,7 +31,7 @@
_hashlib$(SUFFIX): $(HASH_SOURCE) $(SSL_LIB_DIR)/libeay32.lib ../PC/*.h ../Include/*.h
@if not exist "$(TEMP)/_hashlib/." mkdir "$(TEMP)/_hashlib"
- cl /nologo /c $(HASH_SOURCE) $(CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
+ cl /nologo /c $(HASH_SOURCE) $(CFLAGS) $(EXTRA_CFLAGS) /Fo$(TEMP)\_hashlib\$*.obj $(INCLUDES)
link /nologo @<<
/dll /out:_hashlib$(SUFFIX) $(HASH_LIBS) $(TEMP)\_hashlib\$*.obj
<<
Modified: python/trunk/PCbuild/_testcapi.vcproj
==============================================================================
--- python/trunk/PCbuild/_testcapi.vcproj (original)
+++ python/trunk/PCbuild/_testcapi.vcproj Sat Jan 20 15:05:39 2007
@@ -126,7 +126,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/_tkinter.vcproj
==============================================================================
--- python/trunk/PCbuild/_tkinter.vcproj (original)
+++ python/trunk/PCbuild/_tkinter.vcproj Sat Jan 20 15:05:39 2007
@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
Modified: python/trunk/PCbuild/build_ssl.py
==============================================================================
--- python/trunk/PCbuild/build_ssl.py (original)
+++ python/trunk/PCbuild/build_ssl.py Sat Jan 20 15:05:39 2007
@@ -169,6 +169,8 @@
defs = "SSL_DIR=\"%s\"" % (ssl_dir,)
if debug:
defs = defs + " " + "DEBUG=1"
+ if arch in ('amd64', 'ia64'):
+ defs = defs + " EXTRA_CFLAGS=/GS-"
makeCommand = 'nmake /nologo -f _ssl.mak ' + defs + " " + make_flags
print "Executing:", makeCommand
sys.stdout.flush()
Modified: python/trunk/PCbuild/bz2.vcproj
==============================================================================
--- python/trunk/PCbuild/bz2.vcproj (original)
+++ python/trunk/PCbuild/bz2.vcproj Sat Jan 20 15:05:39 2007
@@ -137,7 +137,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
Modified: python/trunk/PCbuild/pyexpat.vcproj
==============================================================================
--- python/trunk/PCbuild/pyexpat.vcproj (original)
+++ python/trunk/PCbuild/pyexpat.vcproj Sat Jan 20 15:05:39 2007
@@ -128,7 +128,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
@@ -189,7 +189,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_OPTERON"
+ AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
Modified: python/trunk/PCbuild/python.vcproj
==============================================================================
--- python/trunk/PCbuild/python.vcproj (original)
+++ python/trunk/PCbuild/python.vcproj Sat Jan 20 15:05:39 2007
@@ -137,7 +137,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/pythoncore.vcproj
==============================================================================
--- python/trunk/PCbuild/pythoncore.vcproj (original)
+++ python/trunk/PCbuild/pythoncore.vcproj Sat Jan 20 15:05:39 2007
@@ -144,7 +144,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/pythonw.vcproj
==============================================================================
--- python/trunk/PCbuild/pythonw.vcproj (original)
+++ python/trunk/PCbuild/pythonw.vcproj Sat Jan 20 15:05:39 2007
@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/select.vcproj
==============================================================================
--- python/trunk/PCbuild/select.vcproj (original)
+++ python/trunk/PCbuild/select.vcproj Sat Jan 20 15:05:39 2007
@@ -130,7 +130,7 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/unicodedata.vcproj
==============================================================================
--- python/trunk/PCbuild/unicodedata.vcproj (original)
+++ python/trunk/PCbuild/unicodedata.vcproj Sat Jan 20 15:05:39 2007
@@ -126,7 +126,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
Modified: python/trunk/PCbuild/winsound.vcproj
==============================================================================
--- python/trunk/PCbuild/winsound.vcproj (original)
+++ python/trunk/PCbuild/winsound.vcproj Sat Jan 20 15:05:39 2007
@@ -128,7 +128,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
+ AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
More information about the Python-checkins
mailing list