From b27444fdc80853af396b9ec88f56d15d57e7d671 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 10 Jan 2008 00:10:02 +0000 Subject: Merged revisions 59864-59882 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r59866 | raymond.hettinger | 2008-01-09 04:02:23 +0100 (Wed, 09 Jan 2008) | 1 line Syntax highlighting only works when >>> lines are accompanied by ... lines ........ r59867 | fred.drake | 2008-01-09 04:11:28 +0100 (Wed, 09 Jan 2008) | 2 lines minor cleaning ........ r59868 | raymond.hettinger | 2008-01-09 04:13:20 +0100 (Wed, 09 Jan 2008) | 1 line Fix typo ........ r59869 | thomas.heller | 2008-01-09 12:19:19 +0100 (Wed, 09 Jan 2008) | 1 line Set the output file in the _ctypes Debug|x64 configuration. ........ r59870 | andrew.kuchling | 2008-01-09 13:27:41 +0100 (Wed, 09 Jan 2008) | 1 line Related to patch #1114: fix another place where attr_t is assumed to be a long ........ r59873 | christian.heimes | 2008-01-09 15:46:10 +0100 (Wed, 09 Jan 2008) | 1 line vs9to8 sync ........ r59876 | christian.heimes | 2008-01-09 20:56:33 +0100 (Wed, 09 Jan 2008) | 1 line Fixed #1776. __import__() no longer imports modules by file name ........ r59879 | thomas.heller | 2008-01-09 22:35:04 +0100 (Wed, 09 Jan 2008) | 6 lines Change amd64 buildbot scripts to use Visual Studio 2008, and to use the required versions of external sources. External sources are not yet built, so the build-step fails to built some targets. ........ r59880 | thomas.heller | 2008-01-09 22:35:43 +0100 (Wed, 09 Jan 2008) | 6 lines Change amd64 buildbot scripts to use Visual Studio 2008, and to use the required versions of external sources. External sources are not yet built, so the build-step fails to built some targets. ........ --- Tools/buildbot/build-amd64.bat | 5 ++-- Tools/buildbot/clean-amd64.bat | 7 +++-- Tools/buildbot/external-amd64.bat | 59 +++++++++++++++++---------------------- 3 files changed, 32 insertions(+), 39 deletions(-) (limited to 'Tools') diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat index cddd3dde6e..b74086e174 100644 --- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -1,6 +1,5 @@ @rem Used by the buildbot "compile" step. -setlocal cmd /c Tools\buildbot\external-amd64.bat -call "%VS71COMNTOOLS%vsvars32.bat" +call "%VS90COMNTOOLS%vsvars32.bat" REM cmd /q/c Tools\buildbot\kill_python.bat -devenv.com /build ReleaseAMD64 PC\VS7.1\pcbuild.sln +vcbuild PCbuild\pcbuild.sln "Debug|x64" diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat index 585476a485..0fc3617554 100644 --- a/Tools/buildbot/clean-amd64.bat +++ b/Tools/buildbot/clean-amd64.bat @@ -1,6 +1,7 @@ @rem Used by the buildbot "clean" step. -call "%VS71COMNTOOLS%vsvars32.bat" -cd PC\VS7.1 +call "%VS90COMNTOOLS%vsvars32.bat" +cd PCbuild @echo Deleting .pyc/.pyo files ... del /s Lib\*.pyc Lib\*.pyo -devenv.com /clean ReleaseAMD64 pcbuild.sln +vcbuild /clean pcbuild.sln "Release|x64" +vcbuild /clean pcbuild.sln "Debug|x64" diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index ec9e6b6214..3e5c8595ab 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -1,50 +1,43 @@ @rem Fetches (and builds if necessary) external dependencies -setlocal -@rem need this so that 'devenv' is found -call "%VS71COMNTOOLS%vsvars32.bat" -@rem set the build environment -call "%MSSdk%\SetEnv" /XP64 /RETAIL +@REM XXX FIXME - building for x64 disabled for now. @rem Assume we start inside the Python source directory -for %%i in (.) do set CWD=%%~fi cd .. - -@rem sqlite -if not exist sqlite-source-3.3.4 ( - svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 - if exist %CWD%\PCbuild\sqlite3.dll del %CWD%\PCbuild\sqlite3.dll -) -if not exist %CWD%\PCbuild\sqlite3.dll ( - cd sqlite-source-3.3.4\amd64 - cl ..\*.c - link /def:..\sqlite3.def /dll *.obj /out:sqlite3.dll bufferoverflowU.lib - cd ..\.. - copy sqlite-source-3.3.4\amd64\sqlite3.dll %CWD%\PCbuild -) +call "%VS90COMNTOOLS%vsvars32.bat" @rem bzip if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3 -if not exist bzip2-1.0.3\libbz2.lib ( - cd bzip2-1.0.3 - nmake /f makefile.msc CFLAGS="-DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo /GS-" - cd .. -) @rem Sleepycat db if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20 -if not exist "db-4.4.20\build_win32\Release_AMD64\libdb44s.lib" ( - cd db-4.4.20\build_win32 - devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv - cd ..\.. -) +@REM if not exist db-4.4.20\build_win32\debug\libdb44sd.lib ( +@REM vcbuild db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static +@REM ) @rem OpenSSL -if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a +if not exist openssl-0.9.8g ( + if exist openssl-0.9.8a rd /s/q openssl-0.9.8a + svn export http://svn.python.org/projects/external/openssl-0.9.8g +) @rem tcltk -if not exist tcl8.4.12 ( +if not exist tcl8.4.16 ( if exist tcltk rd /s/q tcltk - svn export http://svn.python.org/projects/external/tcl8.4.12 - svn export http://svn.python.org/projects/external/tk8.4.12 + if exist tcl8.4.12 rd /s/q tcl8.4.12 + if exist tk8.4.12 rd /s/q tk8.4.12 + svn export http://svn.python.org/projects/external/tcl8.4.16 + svn export http://svn.python.org/projects/external/tk8.4.16 +@REM cd tcl8.4.16\win +@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 +@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install +@REM cd ..\.. +@REM cd tk8.4.16\win +@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 +@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install +@REM cd ..\.. ) + +@rem sqlite +if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 +@REM if not exist build\PCbuild\sqlite3.dll copy sqlite-source-3.3.4\sqlite3.dll build\PCbuild -- cgit v1.2.1