Merged revisions 64267-64272 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64267 | amaury.forgeotdarc | 2008-06-14 09:40:32 +0200 (Sa, 14 Jun 2008) | 2 lines

  Use the correct URL for sqlite3 sources, and try to fix windows buildbots.
........
  r64269 | amaury.forgeotdarc | 2008-06-14 10:36:07 +0200 (Sa, 14 Jun 2008) | 3 lines

  on windows, r64214 broke compilation with some recent SDKs,
  because IPPROTO_IPV6 may be an enumeration member...
........
  r64270 | amaury.forgeotdarc | 2008-06-14 11:44:41 +0200 (Sa, 14 Jun 2008) | 4 lines

  Since python2.6 must run on Windows 2000,
  explicitely disable the use of Windows XP themes when compiling tk.
  This is also consistent with the WINVER=0x0500 option.
........
  r64271 | martin.v.loewis | 2008-06-14 13:50:59 +0200 (Sa, 14 Jun 2008) | 3 lines

  Avoid rebuilding tcl/tk.
  Merge x86 changes into AMD64.
........
  r64272 | martin.v.loewis | 2008-06-14 13:51:54 +0200 (Sa, 14 Jun 2008) | 2 lines

  Set eol-style to CRLF for all batch files.
........

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index a24110f76dce99939b981798b64da34b6e551ee1..8d19cbf8d94a83d7fe1fce55d2270f6ba8d72176 100644 (file)
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -17,9 +17,10 @@
 # include <ws2tcpip.h>
 /* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
  * Separate SDKs have all the functions we want, but older ones don't have
- * any version information. I use IPPROTO_IPV6 to detect a decent SDK.
+ * any version information. 
+ * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
  */
-# ifdef IPPROTO_IPV6
+# ifdef SIO_GET_MULTICAST_FILTER
 #  include <MSTcpIP.h> /* for SIO_RCVALL */
 #  define HAVE_ADDRINFO
 #  define HAVE_SOCKADDR_STORAGE

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 5175c6231e7f7d88985b9dc96b2ddc03a1528a24..8ec332884ed5218b25705f2ff6bce90bbd867f79 100644 (file)
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,6 +1,6 @@
-@rem Used by the buildbot "compile" step.
-cmd /c Tools\buildbot\external-amd64.bat
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-cmd /c Tools\buildbot\clean-amd64.bat
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
-vcbuild PCbuild\pcbuild.sln "Debug|x64"
+@rem Used by the buildbot "compile" step.\r
+cmd /c Tools\buildbot\external-amd64.bat\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+cmd /c Tools\buildbot\clean-amd64.bat\r
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe\r
+vcbuild PCbuild\pcbuild.sln "Debug|x64"\r

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index ab3ea7da46a773ecb5273c828316b2a64f58626a..976ce72b0f9e4c788e3b0e7de661fb5f1625dd8e 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "compile" step.
-cmd /c Tools\buildbot\external.bat
-call "%VS90COMNTOOLS%vsvars32.bat"
-cmd /c Tools\buildbot\clean.bat
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
-vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
-
+@rem Used by the buildbot "compile" step.\r
+cmd /c Tools\buildbot\external.bat\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+cmd /c Tools\buildbot\clean.bat\r
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe\r
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"\r
+\r

diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index 56be05e614a332e77663c5eaf77f514ab43f00ad..167efd040b28ce2799f738b93986ddf27b4dbfcf 100644 (file)
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -1,20 +1,21 @@
-@rem Used by the buildbot "buildmsi" step.
-
-cmd /c Tools\buildbot\external.bat
-@rem build release versions of things
-call "%VS90COMNTOOLS%vsvars32.bat"
-
-@rem build Python
-vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
-
-@rem build the documentation
-bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
-"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python30a5.hhp
-
-@rem buold the MSI file
-cd PC
-nmake /f icons.mak
-cd ..\Tools\msi
-del *.msi
-nmake /f msisupport.mak
-%HOST_PYTHON% msi.py
+@rem Used by the buildbot "buildmsi" step.\r
+\r
+cmd /c Tools\buildbot\external.bat\r
+@rem build release versions of things\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+\r
+@rem build Python\r
+vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"\r
+\r
+@rem build the documentation\r
+bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'\r
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp\r
+\r
+@rem build the MSI file\r
+cd PC\r
+nmake /f icons.mak\r
+cd ..\Tools\msi\r
+del *.msi\r
+nmake /f msisupport.mak\r
+%HOST_PYTHON% msi.py\r
+\r

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 9fb35e94532741f36e0a1bdbaa107beed544308e..1ce16052a73ea8ed99fba13bcccb443410b92f19 100644 (file)
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "clean" step.
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-cd PCbuild
-@echo Deleting .pyc/.pyo files ...
-del /s Lib\*.pyc Lib\*.pyo
-vcbuild /clean pcbuild.sln "Release|x64"
-vcbuild /clean pcbuild.sln "Debug|x64"
+@rem Used by the buildbot "clean" step.\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+cd PCbuild\r
+@echo Deleting .pyc/.pyo files ...\r
+del /s Lib\*.pyc Lib\*.pyo\r
+vcbuild /clean pcbuild.sln "Release|x64"\r
+vcbuild /clean pcbuild.sln "Debug|x64"\r

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index ec71804da0112d3742a3209848eb3e55bb8ae830..0d4d12e3537d5ada6a578b22fb7baedd5ff02ecc 100644 (file)
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "clean" step.
-call "%VS90COMNTOOLS%vsvars32.bat"
-@echo Deleting .pyc/.pyo files ...
-del /s Lib\*.pyc Lib\*.pyo
-cd PCbuild
-vcbuild /clean pcbuild.sln "Release|Win32"
-vcbuild /clean pcbuild.sln "Debug|Win32"
+@rem Used by the buildbot "clean" step.\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+@echo Deleting .pyc/.pyo files ...\r
+del /s Lib\*.pyc Lib\*.pyo\r
+cd PCbuild\r
+vcbuild /clean pcbuild.sln "Release|Win32"\r
+vcbuild /clean pcbuild.sln "Debug|Win32"\r

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index d82f54b8ae7019aeeb3148d05c55ace085338da6..c38e61251251352b5fb83330efece424d10f6b68 100644 (file)
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -1,17 +1,21 @@
-@rem Fetches (and builds if necessary) external dependencies
-
-@rem Assume we start inside the Python source directory
-call "Tools\buildbot\external-common.bat"
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-
-if not exist tcltk64\bin\tcl85g.dll (
-    cd tcl-8.5.2.1\win
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
-    cd ..\..
-)
-
-if not exist tcltk64\bin\tk85g.dll (
-    cd tk-8.5.2.1\win    
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install
-    cd ..\..
-)
+@rem Fetches (and builds if necessary) external dependencies\r
+\r
+@rem Assume we start inside the Python source directory\r
+call "Tools\buildbot\external-common.bat"\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+\r
+if not exist tcltk64\bin\tcl85g.dll (\r
+    cd tcl-8.5.2.1\win\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install\r
+    cd ..\..\r
+)\r
+\r
+if not exist tcltk64\bin\tk85g.dll (\r
+    cd tk-8.5.2.1\win    \r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install\r
+    cd ..\..\r
+)\r
+\r

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 80316be2295e556ea91e84a87845c632654a0250..edcc82d74d2663621b9d07119dd2536600ef9889 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@ cd ..
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
 @rem if exist db-4.4.20 rd /s/q db-4.4.20\r
 @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g\r
-@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9    \r
+@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    \r
 \r
 @rem bzip\r
 if not exist bzip2-1.0.5 (\r
@@ -37,7 +37,7 @@ if not exist tcl-8.5.2.1 (
 if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0\r
 \r
 @rem sqlite3\r
-if not exist sqlite-source-3.5.9 (\r
+if not exist sqlite-3.5.9 (\r
   rd /s/q sqlite-source-3.3.4\r
-  svn export http://svn.python.org/projects/external/sqlite-source-3.5.9\r
+  svn export http://svn.python.org/projects/external/sqlite-3.5.9\r
 )\r

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 592c5853a78355be02f0f7a6113ddf82124eef51..d6b18ae78f8b129b5a2c54631ff74d56f403d89f 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,7 +4,7 @@
 call "Tools\buildbot\external-common.bat"\r
 call "%VS90COMNTOOLS%\vsvars32.bat"\r
 \r
-if not exist tcltk\bin\tcl85.dll (\r
+if not exist tcltk\bin\tcl85g.dll (\r
     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
     cd tcl-8.5.2.1\win\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all \r
@@ -12,10 +12,10 @@ if not exist tcltk\bin\tcl85.dll (
     cd ..\..\r
 )\r
 \r
-if not exist tcltk\bin\tk85.dll (\r
+if not exist tcltk\bin\tk85g.dll (\r
     cd tk-8.5.2.0\win    \r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install\r
     cd ..\..\r
 )\r

diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index d178c92fb55d0dbba1841064bf7c8fd5d8919e2e..6124b51d966a1814adb82b0dca9eb813d14c4063 100644 (file)
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,3 +1,3 @@
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -q -d -x64 -uall -rw
+@rem Used by the buildbot "test" step.\r
+cd PCbuild\r
+call rt.bat -q -d -x64 -uall -rw\r

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 51569d24e25ee083be8da40fe8526e12b8c1f828..fca0dca4e37f1a2b84f4a9cc2eb7772d38401b0d 100644 (file)
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,4 @@
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -d -q -uall -rw -n
+@rem Used by the buildbot "test" step.\r
+cd PCbuild\r
+call rt.bat -d -q -uall -rw\r
+\r