[tor-commits] [tor-browser-bundle/master] Ensure we're using the right gitian-builder commit via tagging.

[mikeperry at torproject.org]

commit 8905f2e7636cdf906882b82c76e2e9f0564d7339
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jun 26 14:59:04 2013 -0700

    Ensure we're using the right gitian-builder commit via tagging.
---
 gitian/check-prerequisites.sh |    2 +-
 gitian/fetch-inputs.sh        |    6 ++++++
 gitian/verify-tags.sh         |   11 ++++++++---
 gitian/versions               |    2 ++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index d716944..201b489 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -27,7 +27,7 @@ then
   echo
   echo "Please run:"
   echo " cd ../../ "
-  echo " torsocks git clone -b tor-browser-builder https://git.torproject.org/user/mikeperry/gitian-builder.git"
+  echo " torsocks git clone -b tor-browser-builder-1 https://git.torproject.org/builders/gitian-builder.git"
   echo " cd -"
   exit 1
 fi
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index a11d2cb..e5121ba 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -130,6 +130,12 @@ ln -sf $NOSCRIPT_PACKAGE noscript at noscript.net.xpi
 ln -sf $PDFJS_PACKAGE uriloader at pdf.js.xpi
 ln -sf $OPENSSL_PACKAGE openssl.tar.gz
 
+# Fetch latest gitian-builder itself
+cd ..
+git fetch origin
+git fetch --tags origin
+cd inputs
+
 if [ -d tbb-windows-installer/.git ];
 then
   cd tbb-windows-installer
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 9c9a243..38dfec6 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -3,8 +3,8 @@
 
 . ./versions
 
-if [ -n $1 ]; then
-  INPUTS_DIR=../../gitian-builder/inputs
+if [ -z "$1" ]; then
+  INPUTS_DIR=$PWD/../../gitian-builder/inputs
 else
   INPUTS_DIR=$1
 fi
@@ -40,11 +40,16 @@ cd tor
 git tag -v $TOR_TAG || exit 1
 cd ..
 
-
 cd https-everywhere
 git tag -v $HTTPSE_TAG || exit 1
 cd ..
 
+# Finally, verify gitian-builder itself
+cd ..
+git tag -v $GITIAN_TAG || exit 1
+git checkout $GITIAN_TAG || exit 1
+cd $INPUTS_DIR
+
 
 exit 0
 
diff --git a/gitian/versions b/gitian/versions
index b21d95a..0b616f0 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -12,6 +12,8 @@ NSIS_TAG=master
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 
+GITIAN_TAG=tor-browser-builder-3.0-1
+
 OPENSSL_VER=1.0.1e
 FIREFOX_LANG_VER=17.0.7esr