[tor-commits] [tor-browser-bundle/master] Append bridge lines to PT bundles.

[mikeperry at torproject.org]

commit f29ec39f7bd73fcadf83f051c9add246e4d0c4f4
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Feb 28 10:11:16 2014 -0800

    Append bridge lines to PT bundles.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    2 ++
 gitian/descriptors/mac/gitian-bundle.yml     |    2 ++
 gitian/descriptors/windows/gitian-bundle.yml |    2 ++
 gitian/mkbundle-linux.sh                     |    3 ++-
 gitian/mkbundle-mac.sh                       |    3 ++-
 gitian/mkbundle-windows.sh                   |    3 ++-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 36c2efc..3fa79cc 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -31,6 +31,7 @@ files:
 - "pluggable-transports-linux32-gbuilt.zip"
 - "pluggable-transports-linux64-gbuilt.zip"
 - "torrc-defaults-appendix-linux"
+- "bridge_prefs.js"
 - "relativelink-src.zip"
 - "linux-skeleton.zip"
 - "linux-langpacks.zip"
@@ -106,6 +107,7 @@ script: |
   if [ $BUILD_PT_BUNDLES ]; then
     unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip
     cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults
+    cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
   fi
   chmod 700 Data/Browser
   chmod 700 Data/Tor
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index da7e918..63c0a96 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -33,6 +33,7 @@ files:
 - "tor-mac32-gbuilt.zip"
 - "pluggable-transports-mac32-gbuilt.zip"
 - "torrc-defaults-appendix-mac"
+- "bridge_prefs.js"
 - "relativelink-src.zip"
 - "mac-skeleton.zip"
 - "mac-dmg.zip"
@@ -125,6 +126,7 @@ script: |
   unzip ~/build/tbb-docs.zip
   if [ $BUILD_PT_BUNDLES ]; then
     cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults
+    cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
   fi
   # Install a "tor" shim that sets the working directory. See #10030.
   mv Tor/tor Tor/tor.real
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 8cf2f05..c8b29c9 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -28,6 +28,7 @@ files:
 - "tor-win32-gbuilt.zip"
 - "pluggable-transports-win32-gbuilt.zip"
 - "torrc-defaults-appendix-windows"
+- "bridge_prefs.js"
 - "relativelink-src.zip"
 - "windows-skeleton.zip"
 - "win32-langpacks.zip"
@@ -108,6 +109,7 @@ script: |
   if [ $BUILD_PT_BUNDLES ]; then
     unzip ~/build/pluggable-transports-win32-gbuilt.zip
     cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults
+    cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
   fi
   cd ..
   #
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index 34485ae..b4e635d 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel
 cd ./Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
-cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux
+cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux
+cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 
 cd linux
 rm -f $GITIAN_DIR/inputs/linux-skeleton.zip
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index d6bffce..18e0f8a 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel
 cd ./Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
-cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
+cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
+cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 cp mac-tor.sh $GITIAN_DIR/inputs/
 
 cd mac
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 037b031..7ab0aa6 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -58,7 +58,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel
 cd ./Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
-cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows
+cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows
+cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 
 cd windows
 rm -f $GITIAN_DIR/inputs/windows-skeleton.zip