[tor-commits] [tor-browser-bundle/master] Download Windows Python MSI package.

[mikeperry at torproject.org]

commit 5a787c146694ebf9eff0963447be2c6d6799ba4a
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Nov 18 03:54:22 2013 +0000

    Download Windows Python MSI package.
    
    gpg --output gpg/PYTHON_MSI.gpg --export --export-options export-minimal 0x7D9DC8D2
    
    We need to have a Python installation in order to compile various Python
    packages. On GNU/Linux, we can use a python-dev package. The Mac OS X
    SDK contains a Python "framework." I tried cross-compiling Python using
    the mingw-w64 tools, but that seems unsupported and likely to require
    many third-party patches.
    
    "cross and native build of python for mingw* hosts"
    http://bugs.python.org/issue3871
    
    "Add support for mingw"
    http://bugs.python.org/issue6335
    
    "Cross compilation patches and build scripts for CPython"
    https://github.com/mingwandroid/crucifixion-freedom
    
    "Cross compilation patches for Python 2.7.3 and 3.3.0, targeting
    MinGW/Darwin/Linux and MinGW builds generated from these."
    https://code.google.com/p/mingw-and-ndk/
---
 gitian/fetch-inputs.sh    |    5 +++--
 gitian/gpg/PYTHON_MSI.gpg |  Bin 0 -> 1167 bytes
 gitian/versions           |    2 ++
 gitian/versions.alpha     |    2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 281f500..933185e 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -132,11 +132,11 @@ checkout_mingw() {
 #  fi
 #done
 
-for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO
+for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI
 do
   PACKAGE="${i}_PACKAGE"
   URL="${i}_URL"
-  if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" ]; then
+  if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o "${i}" == "PYTHON_MSI" ]; then
     SUFFIX="asc"
   else
     SUFFIX="sig"
@@ -256,6 +256,7 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript at noscript.net.xpi
 ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2
 ln -sf "$GCC_PACKAGE" gcc.tar.bz2
 ln -sf "$PYTHON_PACKAGE" python.tar.bz2
+ln -sf "$PYTHON_MSI_PACKAGE" python.msi
 ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz
 ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz
 ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip
diff --git a/gitian/gpg/PYTHON_MSI.gpg b/gitian/gpg/PYTHON_MSI.gpg
new file mode 100644
index 0000000..97abdc1
Binary files /dev/null and b/gitian/gpg/PYTHON_MSI.gpg differ
diff --git a/gitian/versions b/gitian/versions
index 5933c51..0065002 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -40,6 +40,7 @@ MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
+PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
@@ -67,6 +68,7 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
 PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE}
+PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}
 ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE}
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index f38bc5c..abd32cf 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -40,6 +40,7 @@ MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
 PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2
+PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi
 PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz
 ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz
 ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip
@@ -67,6 +68,7 @@ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
 NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}
 PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE}
+PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_PACKAGE}
 PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PACKAGE}
 ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE}
 ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/${ZOPEINTERFACE_PACKAGE}