[tbb-commits] [tor-browser-bundle/maint-3.6] Switch to build candidates directory for fetching Firefox langpacks.

[mikeperry at torproject.org]

commit b139e04c388230ba3aef98376b3d69b7aa3f30e0
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Aug 27 15:55:40 2014 -0700

    Switch to build candidates directory for fetching Firefox langpacks.
    
    This will allow us to build earlier, and also make our build hashes
    reproducible in the event of a minor langpack hash change we decide to
    ignore.
---
 gitian/fetch-inputs.sh  |    6 +++---
 gitian/versions         |    1 +
 gitian/versions.alpha   |    1 +
 gitian/versions.beta    |    1 +
 gitian/versions.nightly |    1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index be5c9d9..32c4139 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -248,13 +248,13 @@ cd langpacks-$FIREFOX_LANG_VER
 for i in $BUNDLE_LOCALES
 do
   cd linux-langpacks
-  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/linux-i686/xpi/$i.xpi"
+  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_VER}-candidates/${FIREFOX_LANG_BUILD}/linux-i686/xpi/$i.xpi"
   cd ..
   cd win32-langpacks
-  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/win32/xpi/$i.xpi"
+  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_VER}-candidates/${FIREFOX_LANG_BUILD}/win32/xpi/$i.xpi"
   cd ..
   cd mac-langpacks
-  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/mac/xpi/$i.xpi"
+  wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_VER}-candidates/${FIREFOX_LANG_BUILD}/mac/xpi/$i.xpi"
   cd ..
 done
 
diff --git a/gitian/versions b/gitian/versions
index e700ad3..25bafb0 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6
 OPENSSL_VER=1.0.1i
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 4906e1c..d7d3dc7 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -27,6 +27,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6
 OPENSSL_VER=1.0.1g
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5
diff --git a/gitian/versions.beta b/gitian/versions.beta
index c76acde..346a5d1 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6
 OPENSSL_VER=1.0.1g
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index e19ebdc..335000b 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6
 OPENSSL_VER=1.0.1g
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.22
 GCC_VER=4.6.3
 PYTHON_VER=2.7.5