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.
........

10 files changed, 84 insertions, 78 deletions

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 5175c62..8ec3328 100644
--- 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.

+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"

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index ab3ea7d..976ce72 100644
--- 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.

+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"

+

diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index 56be05e..167efd0 100644
--- 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.

+

+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\python26a3.hhp

+

+@rem build the MSI file

+cd PC

+nmake /f icons.mak

+cd ..\Tools\msi

+del *.msi

+nmake /f msisupport.mak

+%HOST_PYTHON% msi.py

+

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 9fb35e9..1ce1605 100644
--- 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.

+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"

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index ec71804..0d4d12e 100644
--- 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.

+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"

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index d82f54b..c38e612 100644
--- 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

+

+@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

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install

+    cd ..\..

+)

+

+if not exist tcltk64\bin\tk85g.dll (

+    cd tk-8.5.2.1\win    

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install

+    cd ..\..

+)

+

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 80316be..edcc82d 100644
--- 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

 @rem if exist db-4.4.20 rd /s/q db-4.4.20

 @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g

-@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9    

+@rem if exist sqlite-3.5.9 rd /s/q sqlite-3.5.9    

 

 @rem bzip

 if not exist bzip2-1.0.5 (

@@ -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

 

 @rem sqlite3

-if not exist sqlite-source-3.5.9 (

+if not exist sqlite-3.5.9 (

   rd /s/q sqlite-source-3.3.4

-  svn export http://svn.python.org/projects/external/sqlite-source-3.5.9

+  svn export http://svn.python.org/projects/external/sqlite-3.5.9

 )

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 592c585..d6b18ae 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,7 +4,7 @@
 call "Tools\buildbot\external-common.bat"

 call "%VS90COMNTOOLS%\vsvars32.bat"

 

-if not exist tcltk\bin\tcl85.dll (

+if not exist tcltk\bin\tcl85g.dll (

     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install

     cd tcl-8.5.2.1\win

     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all 

@@ -12,10 +12,10 @@ if not exist tcltk\bin\tcl85.dll (
     cd ..\..

 )

 

-if not exist tcltk\bin\tk85.dll (

+if not exist tcltk\bin\tk85g.dll (

     cd tk-8.5.2.0\win    

-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean

-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all

-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install

     cd ..\..

 )

diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index d178c92..6124b51 100644
--- 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.

+cd PCbuild

+call rt.bat -q -d -x64 -uall -rw

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 51569d2..fca0dca 100644
--- 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.

+cd PCbuild

+call rt.bat -d -q -uall -rw

+