From 4710c53dcad1ebf3755f3efb9e80ac24bd72a9b2 Mon Sep 17 00:00:00 2001 From: darylm503 Date: Mon, 16 Apr 2012 22:12:42 +0000 Subject: AppPkg/Applications/Python: Add Python 2.7.2 sources since the release of Python 2.7.3 made them unavailable from the python.org web site. These files are a subset of the python-2.7.2.tgz distribution from python.org. Changed files from PyMod-2.7.2 have been copied into the corresponding directories of this tree, replacing the original files in the distribution. Signed-off-by: daryl.mcdaniel@intel.com git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13197 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Python-2.7.2/Tools/buildbot/README.tcltk-AMD64 | 36 +++++++++++++++++ .../Python-2.7.2/Tools/buildbot/build-amd64.bat | 6 +++ .../Python/Python-2.7.2/Tools/buildbot/build.bat | 7 ++++ .../Python-2.7.2/Tools/buildbot/buildmsi.bat | 20 ++++++++++ .../Python-2.7.2/Tools/buildbot/clean-amd64.bat | 10 +++++ .../Python/Python-2.7.2/Tools/buildbot/clean.bat | 10 +++++ .../Python-2.7.2/Tools/buildbot/external-amd64.bat | 20 ++++++++++ .../Tools/buildbot/external-common.bat | 45 ++++++++++++++++++++++ .../Python-2.7.2/Tools/buildbot/external.bat | 21 ++++++++++ .../Python-2.7.2/Tools/buildbot/test-amd64.bat | 3 ++ .../Python/Python-2.7.2/Tools/buildbot/test.bat | 3 ++ 11 files changed, 181 insertions(+) create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/README.tcltk-AMD64 create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build-amd64.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/buildmsi.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean-amd64.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-amd64.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-common.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test-amd64.bat create mode 100644 AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test.bat (limited to 'AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot') diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/README.tcltk-AMD64 b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/README.tcltk-AMD64 new file mode 100644 index 0000000000..fcc5374a03 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/README.tcltk-AMD64 @@ -0,0 +1,36 @@ +Comments on building tcl/tk for AMD64 with the MS SDK compiler +============================================================== + +I did have to build tcl/tk manually. + +First, I had to build the nmakehlp.exe helper utility manually by executing + cl nmakehlp.c /link bufferoverflowU.lib +in both the tcl8.4.12\win and tk8.4.12\win directories. + +Second, the AMD64 compiler refuses to compile the file +tcl8.4.12\generic\tclExecute.c because it insists on using intrinsics +for the 'ceil' and 'floor' functions: + + ..\generic\tclExecute.c(394) : error C2099: initializer is not a constant + ..\generic\tclExecute.c(398) : error C2099: initializer is not a constant + +I did comment out these lines; an alternative would have been to use +the /Oi- compiler flag to disable the intrinsic functions. +The commands then used were these: + + svn export http://svn.python.org/projects/external/tcl8.4.12 + cd tcl8.4.12\win + REM + echo patch the tcl8.4.12\generic\tclExecute.c file + pause + REM + cl nmakehlp.c /link bufferoverflowU.lib + nmake -f makefile.vc MACHINE=AMD64 + nmake -f makefile.vc INSTALLDIR=..\..\tcltk install + cd ..\.. + svn export http://svn.python.org/projects/external/tk8.4.12 + cd tk8.4.12\win + cl nmakehlp.c /link bufferoverflowU.lib + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 MACHINE=AMD64 + nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install + cd ..\.. diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build-amd64.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build-amd64.bat new file mode 100644 index 0000000000..8ec332884e --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build-amd64.bat @@ -0,0 +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" diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build.bat new file mode 100644 index 0000000000..976ce72b0f --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/build.bat @@ -0,0 +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" + diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/buildmsi.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/buildmsi.bat new file mode 100644 index 0000000000..b4f63dc847 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/buildmsi.bat @@ -0,0 +1,20 @@ +@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/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean-amd64.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean-amd64.bat new file mode 100644 index 0000000000..0f6b3b4b07 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean-amd64.bat @@ -0,0 +1,10 @@ +@rem Used by the buildbot "clean" step. +call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 +@echo Deleting .pyc/.pyo files ... +del /s Lib\*.pyc Lib\*.pyo +@echo Deleting test leftovers ... +rmdir /s /q build +cd PCbuild +vcbuild /clean pcbuild.sln "Release|x64" +vcbuild /clean pcbuild.sln "Debug|x64" +cd .. diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean.bat new file mode 100644 index 0000000000..cf8a6b747c --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/clean.bat @@ -0,0 +1,10 @@ +@rem Used by the buildbot "clean" step. +call "%VS90COMNTOOLS%vsvars32.bat" +@echo Deleting .pyc/.pyo files ... +del /s Lib\*.pyc Lib\*.pyo +@echo Deleting test leftovers ... +rmdir /s /q build +cd PCbuild +vcbuild /clean pcbuild.sln "Release|Win32" +vcbuild /clean pcbuild.sln "Debug|Win32" +cd .. diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-amd64.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-amd64.bat new file mode 100644 index 0000000000..902e37a9d6 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-amd64.bat @@ -0,0 +1,20 @@ +@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.0\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/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-common.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-common.bat new file mode 100644 index 0000000000..7395db5b50 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external-common.bat @@ -0,0 +1,45 @@ +@rem Common file shared between external.bat and external-amd64.bat. Responsible for +@rem fetching external components into the root\.. buildbot directories. + +cd .. +@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment +@rem the following, check it in, then check it out, comment it out, then check it back in. +@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5 +@rem if exist tcltk rd /s/q tcltk +@rem if exist tcltk64 rd /s/q tcltk64 +@rem if exist tcl8.4.12 rd /s/q tcl8.4.12 +@rem if exist tcl8.4.16 rd /s/q tcl8.4.16 +@rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1 +@rem if exist tk8.4.12 rd /s/q tk8.4.12 +@rem if exist tk8.4.16 rd /s/q tk8.4.16 +@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 db-4.7.25.0 rd /s/q db-4.7.25.0 +@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l +@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 + +@rem bzip +if not exist bzip2-1.0.5 ( + rd /s/q bzip2-1.0.3 + svn export http://svn.python.org/projects/external/bzip2-1.0.5 +) + +@rem Berkeley DB +if exist db-4.4.20 rd /s/q db-4.4.20 +if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 + +@rem OpenSSL +if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l + +@rem tcl/tk +if not exist tcl-8.5.2.1 ( + rd /s/q tcltk tcltk64 + svn export http://svn.python.org/projects/external/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-3.6.21 ( + rd /s/q sqlite-source-3.3.4 + svn export http://svn.python.org/projects/external/sqlite-3.6.21 +) diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external.bat new file mode 100644 index 0000000000..d6b18ae78f --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/external.bat @@ -0,0 +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%\vsvars32.bat" + +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 + nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install + cd ..\.. +) + +if not exist tcltk\bin\tk85g.dll ( + cd tk-8.5.2.0\win + 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/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test-amd64.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test-amd64.bat new file mode 100644 index 0000000000..6124b51d96 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test-amd64.bat @@ -0,0 +1,3 @@ +@rem Used by the buildbot "test" step. +cd PCbuild +call rt.bat -q -d -x64 -uall -rw diff --git a/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test.bat b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test.bat new file mode 100644 index 0000000000..cffd850e05 --- /dev/null +++ b/AppPkg/Applications/Python/Python-2.7.2/Tools/buildbot/test.bat @@ -0,0 +1,3 @@ +@rem Used by the buildbot "test" step. +cd PCbuild +call rt.bat -d -q -uall -rwW -- cgit v1.2.3