[torbrowser/maint-2.2] We discontinued the split bundles - tor-commits

8 Mar 2012

commit 56f1b8bfec6ad824a26a88f0596c93a91bbd152c
Author: Sebastian Hahn sebastian@torproject.org
Date:   Mon Feb 27 10:36:18 2012 +0100
We discontinued the split bundles
Remove instructions pointing to them as well as the Makefile targets
---
 build-scripts/DEPLOYMENT |    7 ++-----
 build-scripts/INSTALL    |   10 ----------
 build-scripts/linux.mk   |    3 ---
 build-scripts/osx.mk     |    3 ---
 build-scripts/windows.mk |   27 +--------------------------
 5 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/build-scripts/DEPLOYMENT b/build-scripts/DEPLOYMENT
index b1727f1..fbb2f1e 100644
--- a/build-scripts/DEPLOYMENT
+++ b/build-scripts/DEPLOYMENT
@@ -32,14 +32,14 @@ Edit the Makefile:
Run:
  $ make reallyclean
- $ USE_PIDGIN=1 make compressed-bundle_de split-bundle_de
+ $ USE_PIDGIN=1 make compressed-bundle_de
This will take around 10 minutes
Initial check
 =============
-Try out tor-browser-..._de.exe and tor-browser-..._de_split.part01.exe
+Try out tor-browser-..._de.exe
Make sure that Firefox, Pidgin and Torbutton work and are in the right
 language
@@ -109,9 +109,6 @@ Copy the files from Windows to the machine with your OpenPGP keys
 Sign them all using the "gpg -ab" command:
  find . -type f -exec gpg --use-agent -ab {} ;
-Move the split signatures to a directory:
- for i in *_split; do mkdir $i/signatures; mv $i/*.asc $i/signatures;done
-
 Upload to www.torproject.org
 ============================
diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL
index 34cd085..f435918 100644
--- a/build-scripts/INSTALL
+++ b/build-scripts/INSTALL
@@ -206,16 +206,6 @@ Run msysDTK-1.0.1.exe and install it into C:\msys\1.0
This will give you Perl, which is necessary for the OpenSSL build
-Installing WinRAR
-=================
-
-To produce self extracting split bundles, we use WinRAR.
-
-Download a trial copy from the WinRAR website:
-http://www.rarlab.com/rar/wrar380.exe
-
-Install it into C:\Program Files\WinRAR
-
 Installing autoconf update
 ==========================
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 0badb16..620a070 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -124,9 +124,6 @@ PIDGIN=$(COMPILED_BINS)/pidgin
 ## Location of utility applications
 WGET:=$(shell which wget)
-## Size of split archive volumes for WinRAR
-SPLITSIZE=1440k
-
 ## Destination for the generic bundle
 DEST=generic-bundle
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 6f0bbc1..236d595 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -136,9 +136,6 @@ PIDGIN=$(COMPILED_BINS)/pidgin
 ## Location of utility applications
 WGET:=$(shell which wget)
-## Size of split archive volumes for WinRAR
-SPLITSIZE=1440k
-
 ## Destination for the generic bundle
 DEST=generic-bundle
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 40ca57c..13e23b5 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -132,9 +132,6 @@ ZLIB=$(COMPILED_LIBS)
 LIBEVENT=$(COMPILED_LIBS)
-## Size of split archive volumes for WinRAR
-SPLITSIZE=1440k
-
 ## Destination for the generic bundle
 DEST="Generic Bundle"
@@ -185,7 +182,7 @@ all-bundles-both:
    USE_PIDGIN=0 make -f windows.mk all-bundles
    make -f windows.mk clean
-all-bundles: all-compressed-bundles all-split-bundles
+all-bundles: all-compressed-bundles
all-compressed-bundles: compressed-bundle_ar \
    compressed-bundle_de \
@@ -200,19 +197,6 @@ all-compressed-bundles: compressed-bundle_ar \
    compressed-bundle_zh-CN \
    compressed-bundle_it
-all-split-bundles: split-bundle_ar \
-	split-bundle_de \
-	split-bundle_en-US \
-	split-bundle_es-ES \
-	split-bundle_fa \
-	split-bundle_fr \
-	split-bundle_nl \
-	split-bundle_pl \
-	split-bundle_pt-PT \
-	split-bundle_ru \
-	split-bundle_zh-CN \
-	split-bundle_it
-
 ##
 ## Cleanup
 ##
@@ -228,10 +212,8 @@ clean:
 reallyclean: clean
    rm -fr $(IM_COMPRESSED_BASENAME)*_*.exe
    rm -fr $(IM_COMPRESSED_BASENAME)*_*.rar 
-	rm -fr $(IM_COMPRESSED_BASENAME)*_*_split
    rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.exe
    rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*.rar
-	rm -fr $(DEFAULT_COMPRESSED_BASENAME)*_*_split
##
 ## Scan .exe files against VirusTotal to check for false positives
@@ -342,8 +324,6 @@ bundle_%:
    LANGCODE=$* make -f windows.mk bundle-localized
 compressed-bundle_%:
    LANGCODE=$* make -f windows.mk compressed-bundle-localized
-split-bundle_%:
-	LANGCODE=$* make -f windows.mk split-bundle-localized
bundle-localized_%.stamp:
    make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \
@@ -356,11 +336,6 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
    rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe
    cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)
-split-bundle-localized: bundle-localized_$(LANGCODE).stamp
-	rm -fr $(COMPRESSED_NAME)_$(LANGCODE)_split; mkdir $(COMPRESSED_NAME)_$(LANGCODE)_split
-	cd $(NAME)_$(LANGCODE); $(WINRAR) a -r -s -ibck -sfx -v$(SPLITSIZE) \
-	    ../$(COMPRESSED_NAME)_$(LANGCODE)_split/$(COMPRESSED_NAME)_$(LANGCODE)_split.exe $(NAME)
-
 copy-files_%: generic-bundle.stamp
    rm -fr $(NAME)_$*
    mkdir $(NAME)_$*

    