[tor-commits] [tor-browser-bundle/master] Move the versions file into place before building any components.

[mikeperry at torproject.org]

commit dd0fefd1485e0e255cdf8dedee8d84eb5bba2588
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Nov 14 18:55:09 2013 -0800

    Move the versions file into place before building any components.
---
 gitian/mkbundle-linux.sh   |    2 +-
 gitian/mkbundle-mac.sh     |    2 +-
 gitian/mkbundle-windows.sh |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index fd5e924..182b1b6 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -39,6 +39,7 @@ export PATH=$PATH:$PWD/libexec
 
 echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Linux\");" > $GITIAN_DIR/inputs/torbrowser.version 
 echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version
+cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
 
 cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/
 
@@ -127,7 +128,6 @@ then
   echo "****** Starting Bundling+Localization of Linux Bundle (3/3 for Linux) ******"
   echo 
   
-  cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
   cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
   
   ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index f64e7af..edd3846 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -39,6 +39,7 @@ export PATH=$PATH:$PWD/libexec
 
 echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DIR/inputs/torbrowser.version 
 echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version
+cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
 
 cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/
 
@@ -124,7 +125,6 @@ then
   echo "****** Starting Bundling+Localization Component of Mac Bundle (3/3 for Mac) ******"
   echo 
   
-  cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
   cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
   
   ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 28b61b8..fd0cf42 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -40,6 +40,7 @@ export PATH=$PATH:$PWD/libexec
 
 echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_DIR/inputs/torbrowser.version 
 echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version
+cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions
 
 cp $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/