commit d1558e365be1938c11a3fddd1595f59f83073dce Author: David Fifield david@bamsoftware.com Date: Sun Jan 12 16:42:02 2014 +0000
Copy PT programs and config only when making "beta". --- gitian/descriptors/linux/gitian-bundle.yml | 6 ++++-- gitian/descriptors/mac/gitian-bundle.yml | 8 ++++++-- gitian/descriptors/windows/gitian-bundle.yml | 6 ++++-- gitian/versions.beta | 1 + 4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 4d25eb7..f7f6e0b 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -101,10 +101,12 @@ script: | cd tor-browser unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip - unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip + cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + fi chmod 700 Data/Browser chmod 700 Data/Tor cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 5ae6997..3700e46 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -99,11 +99,15 @@ script: | cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip - unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip + fi cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real cp ~/build/mac-tor.sh Tor/tor diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 393d5d8..4ee42d5 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -103,10 +103,12 @@ script: | cd "Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip - unzip ~/build/pluggable-transports-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip - cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + if [ "$TORBROWSER_VERSION_SPECIAL" == "beta" ]; then + unzip ~/build/pluggable-transports-win32-gbuilt.zip + cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + fi cd .. # # Copy reproducibility info diff --git a/gitian/versions.beta b/gitian/versions.beta index f5fa840..cc2080e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,5 @@ TORBROWSER_VERSION=3.6-beta-1 +TORBROWSER_VERSION_SPECIAL=beta BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
VERIFY_TAGS=1