Author: pfg Date: Thu Jul 26 20:20:33 2012 New Revision: 1366182 URL: http://svn.apache.org/viewvc?rev=1366182&view=rev Log: i119384 - Python update to version 2.7.3
This is the last 2.x version released: it includes many bug fixes and also supports some backward compatible features from the 3.1 series. More information is available here: http://www.python.org/download/releases/2.7.3/ In order to reduce conflicts the patches were reorganized: the FreeBSD patches are in their own patch now. The SSL patches were split in three parts: -md5, -ssl and a Windows-specific component that was merged along with -security-flags into -pcbuild. Patch by: Hanya Runo and pfg@ Added: incubator/ooo/trunk/ext_sources/c57477edd6d18bd9eeca2f21add73919-Python-2.7.3.tar.bz2 (with props) incubator/ooo/trunk/main/python/python-2.7.3-mingw.patch incubator/ooo/trunk/main/python/python-2.7.3-nohardlink.patch incubator/ooo/trunk/main/python/python-2.7.3-pcbuild.patch incubator/ooo/trunk/main/python/python-2.7.3-sysbase.patch incubator/ooo/trunk/main/python/python-2.7.3.patch incubator/ooo/trunk/main/python/python-freebsd.patch incubator/ooo/trunk/main/python/python-md5.patch incubator/ooo/trunk/main/python/python-ssl.patch Removed: incubator/ooo/trunk/main/python/Python-2.6.1-mingw.patch incubator/ooo/trunk/main/python/Python-2.6.1-nohardlink.patch incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch incubator/ooo/trunk/main/python/Python-2.6.1-sysbase.patch incubator/ooo/trunk/main/python/Python-2.6.1.patch incubator/ooo/trunk/main/python/Python-disable-dbm.patch incubator/ooo/trunk/main/python/Python-linux3.patch incubator/ooo/trunk/main/python/Python-parallel-make.patch incubator/ooo/trunk/main/python/Python-ssl.patch incubator/ooo/trunk/main/python/Python-subversion-1-7.patch Modified: incubator/ooo/trunk/main/external_deps.lst incubator/ooo/trunk/main/python/makefile.mk incubator/ooo/trunk/main/python/prj/d.lst incubator/ooo/trunk/main/python/pyversion.mk incubator/ooo/trunk/main/pyuno/zipcore/makefile.mk Added: incubator/ooo/trunk/ext_sources/c57477edd6d18bd9eeca2f21add73919-Python-2.7.3.tar.bz2 URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/c57477edd6d18bd9eeca2f21add73919-Python-2.7.3.tar.bz2?rev=1366182&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/ooo/trunk/ext_sources/c57477edd6d18bd9eeca2f21add73919-Python-2.7.3.tar.bz2 ------------------------------------------------------------------------------ svn:mime-type = application/x-bzip2 Modified: incubator/ooo/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1366182&r1=1366181&r2=1366182&view=diff ============================================================================== --- incubator/ooo/trunk/main/external_deps.lst (original) +++ incubator/ooo/trunk/main/external_deps.lst Thu Jul 26 20:20:33 2012 @@ -201,13 +201,8 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(SVN_TRUNK)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) - MD5 = bc702168a2af16869201dbe91e46ae48 - name = LICENSE_Python-2.6.1 - URL1 = $(SVN_TRUNK)$(MD5)-$(name) - -if (SYSTEM_PYTHON != YES) - MD5 = e81c2f0953aa60f8062c05a4673f2be0 - name = Python-2.6.1.tar.bz2 + MD5 = c57477edd6d18bd9eeca2f21add73919 + name = Python-2.7.3.tar.bz2 URL1 = $(SVN_TRUNK)$(MD5)-$(name) if (GUI!=UNX || SYSTEM_ZLIB!=YES) Modified: incubator/ooo/trunk/main/python/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/makefile.mk?rev=1366182&r1=1366181&r2=1366182&view=diff ============================================================================== --- incubator/ooo/trunk/main/python/makefile.mk (original) +++ incubator/ooo/trunk/main/python/makefile.mk Thu Jul 26 20:20:33 2012 @@ -42,17 +42,15 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 +TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919 PATCH_FILES=\ - Python-$(PYVERSION).patch \ - Python-parallel-make.patch \ - Python-ssl.patch \ - Python-2.6.1-sysbase.patch \ - Python-2.6.1-nohardlink.patch \ - Python-2.6.1-security-flags.patch \ - Python-disable-dbm.patch \ - Python-linux3.patch \ - Python-subversion-1-7.patch + python-$(PYVERSION).patch \ + python-freebsd.patch \ + python-md5.patch \ + python-ssl.patch \ + python-$(PYVERSION)-sysbase.patch \ + python-$(PYVERSION)-nohardlink.patch \ + python-$(PYVERSION)-pcbuild.patch CONFIGURE_DIR= @@ -84,7 +82,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$ # WINDOWS # ---------------------------------- .IF "$(COM)"=="GCC" -PATCH_FILES=Python-$(PYVERSION)-mingw.patch +PATCH_FILES=python-$(PYVERSION)-mingw.patch BUILD_DIR= MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build python_CFLAGS=-mno-cygwin -mthreads @@ -112,6 +110,9 @@ BUILD_ACTION=$(ENV_BUILD) make && make i BUILD_DIR=PCbuild +PATCH_FILES=Python-$(PYVERSION)-vc.patch \ + Python-$(PYVERSION)-ssl-vc.patch + # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native Modified: incubator/ooo/trunk/main/python/prj/d.lst URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/prj/d.lst?rev=1366182&r1=1366181&r2=1366182&view=diff ============================================================================== --- incubator/ooo/trunk/main/python/prj/d.lst (original) +++ incubator/ooo/trunk/main/python/prj/d.lst Thu Jul 26 20:20:33 2012 @@ -30,74 +30,85 @@ mkdir: %_DEST%\lib%_EXT%\python\lib2to3\ mkdir: %_DEST%\lib%_EXT%\python\sqlite3 mkdir: %_DEST%\lib%_EXT%\python\ctypes mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib - -..\%__SRC%\misc\build\Python-2.6.1\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +mkdir: %_DEST%\lib%_EXT%\python\importlib +mkdir: %_DEST%\lib%_EXT%\python\multiprocessing +mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy +mkdir: %_DEST%\lib%_EXT%\python\unittest +mkdir: %_DEST%\lib%_EXT%\python\python2.7\config + +..\%__SRC%\misc\build\Python-2.7.3\Lib\* %_DEST%\lib%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\email\* %_DEST%\lib%_EXT%\python\email\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\config\* %_DEST%\lib%_EXT%\python\config\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\json\* %_DEST%\lib%_EXT%\python\json\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.3\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.3\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* +..\%__SRC%\misc\build\Python-2.7.3\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* +..\%__SRC%\misc\build\Python-2.7.3\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile ..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk -..\%__SRC%\misc\build\Python-2.6.1\Include\* %_DEST%\inc%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.3\Include\* %_DEST%\inc%_EXT%\python\* #unix ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\Python-2.6.1\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h -..\%__SRC%\misc\build\python-inst\lib\python2.6\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\* -..\%__SRC%\misc\build\python-inst\bin\python2.6 %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\python-inst\lib\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so.1.0 -symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so +..\%__SRC%\misc\build\Python-2.7.3\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h +..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\* +..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python +..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0 +symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so # MacOS X -..\%__SRC%\misc\build\python-inst\lib\libpython2.6.dylib %_DEST%\lib%_EXT%\libpython2.6.dylib +..\%__SRC%\misc\build\python-inst\lib\libpython2.7.dylib %_DEST%\lib%_EXT%\libpython2.7.dylib #MingW ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\libpython2.6.dll %_DEST%\bin%_EXT%\libpython2.6.dll +..\%__SRC%\misc\build\Python-2.7.3\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll # WINDOWS ONLY ! ..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.7.3\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd #linklib: libpython.so.*.*.*