[Python-checkins] r59158 - python/trunk/PCbuild9/_sqlite3.vcproj python/trunk/PCbuild9/build_ssl.py
christian.heimes
python-checkins at python.org
Sat Nov 24 02:53:59 CET 2007
Author: christian.heimes
Date: Sat Nov 24 02:53:59 2007
New Revision: 59158
Modified:
python/trunk/PCbuild9/_sqlite3.vcproj
python/trunk/PCbuild9/build_ssl.py
Log:
Backport of fixes from py3k branch
svn merge -r59131:HEAD ../../py3k/PCbuild9/ .
Modified: python/trunk/PCbuild9/_sqlite3.vcproj
==============================================================================
--- python/trunk/PCbuild9/_sqlite3.vcproj (original)
+++ python/trunk/PCbuild9/_sqlite3.vcproj Sat Nov 24 02:53:59 2007
@@ -53,7 +53,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -117,7 +118,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -181,7 +183,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -246,7 +249,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -310,7 +314,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -375,7 +380,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -440,7 +446,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
@@ -505,7 +512,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)
"
+ Description="Build sqlite3 libs and dll"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist sqlite3.dll copy sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy "sqlite3.dll $(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
Modified: python/trunk/PCbuild9/build_ssl.py
==============================================================================
--- python/trunk/PCbuild9/build_ssl.py (original)
+++ python/trunk/PCbuild9/build_ssl.py Sat Nov 24 02:53:59 2007
@@ -131,6 +131,13 @@
line = "CP=copy\n"
if line.startswith("MKDIR="):
line = "MKDIR=mkdir\n"
+ if line.startswith("CFLAG="):
+ line = line.strip()
+ for algo in ("RC5", "MDC2", "IDEA"):
+ noalgo = " -DOPENSSL_NO_%s" % algo
+ if noalgo not in line:
+ line = line + noalgo
+ line = line + '\n'
fout.write(line)
def run_configure(configure, do_script):
More information about the Python-checkins
mailing list