Finished Release v2.7.8.11

Author: Arnon Yaari

buildout-build-suse-ppc64.cfg

@@ -1,39 +1,12 @@
 [buildout]
-extends = buildout-build.cfg
-
-[environment]
-CC = gcc -static-libgcc -fPIC
-LDFLAGS = -L${options:prefix}/lib64 -Wl,-rpath,\$$ORIGIN,-rpath,\$$ORIGIN/../lib64,-rpath-link,\$$ORIGIN,-rpath-link,\$$ORIGIN/../lib64
-SHARED_LDFLAGS = -L${options:prefix}/lib64 -Wl,-rpath,-rpath,\$$ORIGIN,\$$ORIGIN/../lib64,-rpath-link,\$$ORIGIN,-rpath-link,\$$ORIGIN/../lib64
-LIBPATH = -L${options:prefix}/lib64
-DYLD_LIBRARY_PATH = ${options:prefix}/lib64
-LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
+extends = buildout-build-redhat-ppc64.cfg
 
 [openssl]
-configure-command = ./Configure
+# we extend from redhat-ppc64 where --openssldir is set - we don't need that here
 configure-options = linux-ppc64 --prefix=${:prefix} --shared --libdir=lib64
 
 [libgcrypt]
 configure-options = ${options:configure-options} --with-gpg-error-prefix=${:prefix} --enable-static --libdir=${options:prefix}/lib64
 
 [readline]
 configure-options = --prefix=${options:prefix} --libdir=${options:prefix}/lib64
-
-[cyrus-sasl]
-configure-options = --prefix=${options:prefix} --without-saslauthd --without-authdaemond --disable-java --disable-dependency-tracking --disable-rpath --disable-java --without-gdbm --without-dblib --disable-macos-framework --enable-static --libdir=${options:prefix}/lib64 --build=ppc
-patches = ${:patches-dir}/${:name}-${:version}-configure.patch
-    ${:patches-dir}/${:name}-${:version}-ltconfig.patch
-    ${:patches-dir}/${:name}-${:version}-digestmd5.patch
-    ${:patches-dir}/${:name}-${:version}-redhat-lib64.patch
-
-[python]
-configure-options = --prefix=${options:prefix} --enable-shared --enable-ipv6 --with-dbmliborder=gdbm --with-gcc --with-system-ffi --libdir=${options:prefix}/lib64
-patches = ${:patches-dir}/${:name}-${:version}-sysconfig.py.patch
-    ${:patches-dir}/${:name}-${:version}-disutils-sysconfig.py.patch
-    ${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
-    ${:patches-dir}/${:name}-${:version}-redhat-lib64.patch
-    ${:patches-dir}/${:name}-${:version}-linux-symlink.patch
-
-[python-environment]
-CFLAGS = ${environment:CFLAGS} -I${options:prefix}/include/gnutls -I${options:prefix}/include/graphviz -I${options:prefix}/include/libexslt -I${options:prefix}/include/libxml2 -I${options:prefix}/include/libxslt -I${options:prefix}/include/ncurses -I${options:prefix}/include/openssl -I${options:prefix}/include/readline -I${options:prefix}/include/sasl -I${options:prefix}/lib64/libffi-${libffi:version}/include
-LDFLAGS = ${environment:LDFLAGS} -Wl,-rpath,\$$ORIGIN/../.. -L${options:prefix}/lib64/engines -L${options:prefix}/lib64/gettext -L${options:prefix}/lib64/graphviz -L${options:prefix}/lib64/libxslt-plugins -L${options:prefix}/lib64/pkgconfig -L${options:prefix}/lib64/python2.7 -L${options:prefix}/lib64/sasl2

buildout-build-windows-64bit.cfg

@@ -3,36 +3,26 @@ extends = buildout-build-windows.cfg
 
 [environment-windows]
 FrameworkDir = ${:WinDir}\Microsoft.NET\Framework64
-VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 10.0
+VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
 ProgramFiles64 = ${:SystemDrive}\Program Files (x86)
 VSBIN = ${:VCRoot}\BIN\amd64
 ATLMFC_LIB = ${:VCRoot}\ATLMFC\LIB\amd64
 VSLIB = ${:VCRoot}\LIB\amd64
-VC100CRT = ${:VCRoot}\redist\x64\Microsoft.VC100.CRT\msvcr100.dll
+VC90CRT = ${:VCRoot}\redist\amd64\Microsoft.VC90.CRT
 SDKLIB = ${:WindowsSdkDir}\lib\x64
 SDKLIB32 = ${:WindowsSdkDir}\lib
 SDKBIN = ${:WindowsSdkDir}\bin\x64
 PerlExe = ${:SystemDrive}\Perl64\bin\perl.exe
-MSBuildExtensionsPath32 = ${:ProgramFiles64}\MSBuild
-
-[visual-studio-2008-environment]
-<= environment-windows
-VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
 
 [openssl]
 configure-options = Configure VC-WIN64A enable-zlib enable-static-engine enable-zlib-dynamic enable-capieng no-asm no-shared --prefix=${options:prefix}
 pre-make-hook = ${options:hooks-dir}\windows.py:openssl_pre_make64
 
 [db]
-<= options
-environment-section = visual-studio-2008-environment
 make-binary = devenv
 make-options = build_windows\Berkeley_DB.sln /build "Release|x64"
 post-make-hook = ${options:hooks-dir}\windows.py:db_post_make64
 
-[python-win-instrumentation]
-make-options = pcbuild.sln /p:Configuration=PGInstrument;Platform=x64
-
 [python-win]
-make-options = pcbuild.sln /p:Configuration=PGUpdate;Platform=x64
+make-options = pcbuild.sln /useenv /build "Release|x64"
 post-make-hook = ${options:hooks-dir}\windows.py:python_post_make64

buildout-build-windows.cfg

@@ -1,12 +1,12 @@
 [buildout]
 extends = buildout-build.cfg
-parts = mkdir zlib db openssl libiconv-no-nls-static bzip2 gettext-static libiconv-static tcl tcl-win tk tk-win sqlite3 sqlite3-win libxml2 libxml2-win libxslt libxslt-win libevent python python-win-instrumentation python-win
+parts = mkdir zlib db openssl libiconv-no-nls-static bzip2 gettext-static libiconv-static tcl tcl-win tk tk-win sqlite3 sqlite3-win libxml2 libxml2-win libxslt libxslt-win libevent python python-win
 
 [environment-windows]
 APPVER = 5.02
 CPU = i386
 TARGETOS = WINNT
-FrameworkVersion = v4.0.30319
+FrameworkVersion = v2.0.50727
 OS = Windows_NT
 RegKeyPath = HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VC7
 VSRegKeyPath = HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\SxS\VS7
@@ -18,10 +18,10 @@ ORIGINALPATH = ${:WinDir}\system32;${:WinDir};${:WinDir}\System32\Wbem;${:Progra
 FrameworkDir = ${:WinDir}\Microsoft.NET\Framework
 FxTools = ${:FrameworkDir}\v3.5;${:FrameworkDir}\${:FrameworkVersion}
 WindowsSdkDir = ${:ProgramFiles}\Microsoft SDKs\Windows\v7.0
-VSINSTALLDIR = ${:ProgramFiles}\Microsoft Visual Studio 10.0
+VSINSTALLDIR = ${:ProgramFiles}\Microsoft Visual Studio 9.0
 VCRoot = ${:VSINSTALLDIR}\VC
 VCINSTALLDIR = ${:VCRoot}
-VC100CRT = ${:VCRoot}\redist\x86\Microsoft.VC100.CRT\msvcr100.dll
+VC90CRT = ${:VCRoot}\redist\x86\Microsoft.VC90.CRT
 INCLUDE = ${:VCRoot}\Include;${:WindowsSdkDir}\Include;${:WindowsSdkDir}\Include\gl;${:VCRoot}\ATLMFC\INCLUDE;
 MSSdk = ${:WindowsSdkDir}
 NODEBUG = 1
@@ -54,14 +54,6 @@ MSVCDIR = ${:VSINSTALLDIR}
 LIB = ${:VCRoot}\Lib;${:WindowsSdkDir}\Lib;${:VCRoot}\ATLMFC\LIB;
 Path = ${:VCRoot}\Bin;${:VCRoot}\vcpackages;${:VSINSTALLDIR}\Common7\IDE;${:WindowsSdkDir}\Bin;${:WinDir}\Microsoft.NET\Framework\v3.5;${:WinDir}\Microsoft.NET\Framework\${:FrameworkVersion};${:WindowsSdkDir}\Setup;${:WinDir}\system32;${:WinDir};${:WinDir}\System32\Wbem;${:ProgramFiles}\Git\cmd;${:ProgramFiles}\Git\bin;C:\Python27
 
-[visual-studio-2008-environment]
-<= environment-windows
-VSINSTALLDIR = ${:ProgramFiles}\Microsoft Visual Studio 9.0
-VCRoot = ${:VSINSTALLDIR}\VC
-VSBIN = ${:VCRoot}\BIN
-DevEnvDir = ${:VSINSTALLDIR}\Common7\IDE
-PATH = ${:DevEnvDir};${:VSBIN};${:VSINSTALLDIR}\Common7\Tools;${:VSINSTALLDIR}\Common7\Tools\bin;${:FrameworkDir};${:FrameworkDir}\Microsoft .NET Framework 3.5 (Pre-Release Version);${:FrameworkDir}\${:FrameworkVersion};${:VCRoot}\VCPackages;${:SDKBIN};${:WinDir}\system32;${:WinDir};${:WinDir}\System32\Wbem;${:GitDir}\cmd;${:GitBinDir};${:PythonBinDir};${:CygwinBinDir}
-
 [options]
 configure-command = true
 configure-options =
@@ -191,8 +183,6 @@ make-binary = nmake
 make-options = -f Makefile.vc all install OPTS=static,threads INSTALLDIR=${options:prefix}
 
 [db]
-<= options
-environment-section = visual-studio-2008-environment
 make-binary = devenv
 make-options = build_windows\Berkeley_DB.sln /build "Release|Win32"
 configure-command = true
@@ -212,7 +202,6 @@ configure-options = configure.js compiler=msvc cruntime=/MT prefix=${options:pre
 make-options = -f Makefile.msvc
 
 [libxslt]
-patches = ${:patches-dir}/libxslt-${:version}-windows-Makefile.patch
 make-binary = true
 
 [libxslt-win]
@@ -243,21 +232,17 @@ patches = ${:patches-dir}/${:name}-${:version}-windows-Makefile.patch
     ${:patches-dir}/${:name}-${:version}-disutils-sysconfig.py.patch
     ${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
     ${:patches-dir}/${:name}-${:version}-windows-getpathp.patch
+    ${:patches-dir}/${:name}-${:version}-windows-make_buildinfo.patch
     ${:patches-dir}/${:name}-${:version}-windows-make_versioninfo.patch
 post-make-hook =
 
-[python-win-instrumentation]
+[python-win]
 <= options
 recipe = hexagonit.recipe.cmmi
 path = ${buildout:directory}\parts\python__compile__\python-${python:version}\PCbuild
-make-binary = msbuild
-make-options = pcbuild.sln /p:Configuration=PGInstrument;Platform=Win32
+make-binary = devenv
+make-options = pcbuild.sln /useenv /build "Release|Win32"
 environment-section = python-win-environment
-make-targets =
-
-[python-win]
-<= python-win-instrumentation
-make-options = pcbuild.sln /p:Configuration=PGUpdate;Platform=Win32
 post-make-hook = ${options:hooks-dir}\windows.py:python_post_make
 
 [python-win-environment]

buildout-build.cfg

@@ -244,7 +244,7 @@ url = ${urls:source}/${:name}-${:version}.tar.gz
 <= options
 recipe = hexagonit.recipe.cmmi
 name = python
-version = 2.7.12
+version = 2.7.8
 url = ${urls:source}/Python-${:version}.tgz
 configure-options = --prefix=${options:prefix} --enable-shared --enable-ipv6 --with-dbmliborder=gdbm --with-gcc --with-system-ffi
 environment-section = python-environment

buildout-pack-windows.cfg

@@ -4,7 +4,7 @@ extends = buildout-pack.cfg
 
 [pack]
 include_list =
-    dist\bin\Microsoft.VC100.CRT
+    dist\bin\Microsoft.VC90.CRT
     dist\bin\python.exe
     dist\bin\pythonw.exe
     dist\bin\python27.dll

sources

@@ -29,8 +29,9 @@ nettle-2.7.1.tar.gz                     https://ftp.gnu.org/gnu/nettle/nettle-2.
 openldap-stable-20100719.tgz            http://www.openldap.org/software/download/OpenLDAP/openldap-stable/openldap-stable-20100719.tgz
 openssh-7.3p1.tar.gz                    http://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/openssh-7.3p1.tar.gz
 openssh-5.8p1.tar.gz                    http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p1.tar.gz
+openssl-1.0.1j.tar.gz                   https://www.openssl.org/source/openssl-1.0.1j.tar.gz
 openssl-1.0.2h.tar.gz                   https://www.openssl.org/source/openssl-1.0.2h.tar.gz
-Python-2.7.12.tgz                       https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz
+Python-2.7.8.tgz                        https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
 readline-6.2.tar.gz                     https://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
 sqlite-autoconf-3070602.tar.gz          ftp://ftp.funet.fi/ftp/pub/NetBSD/packages/distfiles/sqlite-autoconf-3070602.tar.gz
 tcl8.5.15-src.tar.gz                    http://prdownloads.sourceforge.net/tcl/tcl8.5.15-src.tar.gz

src/hooks/windows.py

@@ -94,13 +94,13 @@ def make_ico(self):
 
     def _copy_crt_assemblies(self, dst):
         os.makedirs(dst)
-        src = glob.glob(path.join(self.environ['VC100CRT'], '*'))
+        src = glob.glob(path.join(self.environ['VC90CRT'], '*'))
         _copy_files(src, dst)
 
     def copy_crt_assemblies(self):
-        dst = path.join(self.prefix, 'bin', 'Microsoft.VC100.CRT')
+        dst = path.join(self.prefix, 'bin', 'Microsoft.VC90.CRT')
         self._copy_crt_assemblies(dst)
-        dst = path.join(self.prefix, 'DLLs', 'Microsoft.VC100.CRT')
+        dst = path.join(self.prefix, 'DLLs', 'Microsoft.VC90.CRT')
         self._copy_crt_assemblies(dst)
 
     def make_includes(self):