[tor-commits] [tor-browser-bundle/master] Back out the python building from Mac and Windows.

[mikeperry at torproject.org]

commit 489bb4b51fa057e83d711a03beb5aa4883bad935
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Dec 3 02:24:17 2013 -0800

    Back out the python building from Mac and Windows.
    
    Their ubuntu base version already included 2.7. No need to build it.
---
 gitian/descriptors/mac/gitian-firefox.yml     |   15 ---------------
 gitian/descriptors/windows/gitian-firefox.yml |   16 ----------------
 2 files changed, 31 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index 74b4287..e252888 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -12,7 +12,6 @@ packages:
 - "autoconf2.13"
 - "faketime"
 - "yasm"
-- "zlib1g-dev"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor-browser.git"
@@ -23,7 +22,6 @@ files:
 - "x86_64-apple-darwin10.tar.xz"
 - "re-dzip.sh"
 - "dzip.sh"
-- "python.tar.bz2"
 - "versions"
 script: |
   INSTDIR="$HOME/install/"
@@ -37,19 +35,6 @@ script: |
   mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/
   mkdir -p $OUTDIR/
   #
-  # XXX: Refactor this out into a separate descriptor
-  # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship
-  # with Python 2.6. Thus, we compile 2.7 ourselves...
-  if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then
-    mkdir python
-    cd python
-    tar -xjvf ../python.tar.bz2
-    Python-*/configure
-    make
-    sudo make install
-    cd ..
-  fi
-  #
   sudo dpkg -i *.deb
   tar -xavf x86_64-apple-darwin10.tar.xz
   # XXX: Needed for the otool patch. But we should replace that one with a
diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index 94b6ba0..f985b56 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -32,7 +32,6 @@ files:
 - "i686-w64-mingw32-g++"
 - "i686-w64-mingw32-ld"
 - "msvcr100.dll"
-- "python.tar.bz2"
 - "versions"
 script: |
   INSTDIR="$HOME/install"
@@ -58,21 +57,6 @@ script: |
   # linked against msvcrt by default. See bug 9084 for a more detailed
   # discussion.
 
-  #
-  # XXX: Refactor this out into a separate descriptor
-  # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship
-  # with Python 2.6. Thus, we compile 2.7 ourselves...
-  if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then
-    mkdir python
-    cd python
-    tar -xjvf ../python.tar.bz2
-    Python-*/configure
-    make
-    sudo make install
-    cd ..
-  fi
-  #
-
   # FIXME: We need sudo for all of this because otherwise
   # the toolchain can't find the alternate prefix for the CRT headers :/