[Python-3000-checkins] r59345 - in python/branches/py3k: PCbuild9/_sqlite3.vcproj PCbuild9/build_tkinter.py Tools/pybench/pybench.py
christian.heimes
python-3000-checkins at python.org
Wed Dec 5 10:34:12 CET 2007
Author: christian.heimes
Date: Wed Dec 5 10:34:12 2007
New Revision: 59345
Modified:
python/branches/py3k/PCbuild9/_sqlite3.vcproj
python/branches/py3k/PCbuild9/build_tkinter.py
python/branches/py3k/Tools/pybench/pybench.py
Log:
Fixed quoting and paths in the sqlite project file
Modified: python/branches/py3k/PCbuild9/_sqlite3.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/_sqlite3.vcproj (original)
+++ python/branches/py3k/PCbuild9/_sqlite3.vcproj Wed Dec 5 10:34:12 2007
@@ -54,7 +54,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -119,7 +119,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -184,7 +184,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -250,7 +250,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -315,7 +315,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -381,7 +381,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -447,7 +447,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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"
@@ -513,7 +513,7 @@
<Tool
Name="VCPreLinkEventTool"
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)"
"
+ CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\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/branches/py3k/PCbuild9/build_tkinter.py
==============================================================================
--- python/branches/py3k/PCbuild9/build_tkinter.py (original)
+++ python/branches/py3k/PCbuild9/build_tkinter.py Wed Dec 5 10:34:12 2007
@@ -12,12 +12,12 @@
here = os.path.abspath(os.path.dirname(__file__))
par = os.path.pardir
-#TCL = "tcl8.4.16"
-#TIX = "Tix8.4.2"
-#TK = "tk8.4.16"
-TCL = "tcl8.4.12"
-TIX = "Tix8.4.0"
-TK = "tk8.4.12"
+TCL = "tcl8.4.16"
+TIX = "Tix8.4.2"
+TK = "tk8.4.16"
+#TCL = "tcl8.4.12"
+#TIX = "Tix8.4.0"
+#TK = "tk8.4.12"
ROOT = os.path.abspath(os.path.join(here, par, par))
NMAKE = "nmake /nologo "
Modified: python/branches/py3k/Tools/pybench/pybench.py
==============================================================================
--- python/branches/py3k/Tools/pybench/pybench.py (original)
+++ python/branches/py3k/Tools/pybench/pybench.py Wed Dec 5 10:34:12 2007
@@ -301,6 +301,7 @@
if _debug:
print('Calib. overhead time = %.6fms' % (
min_overhead * MILLI_SECONDS))
+ return
if min_overhead < 0.0:
raise ValueError('calibration setup did not work')
if max_overhead - min_overhead > 0.1:
More information about the Python-3000-checkins
mailing list