[tor-commits] [torbrowser/master] remove unused files (old READMEs and Makefile)

erinn at torproject.org erinn at torproject.org
Tue Oct 25 16:04:28 UTC 2011


commit 553e79eb93eca0ee49b656faf2e62af0641e93c2
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Oct 25 17:03:30 2011 +0100

    remove unused files (old READMEs and Makefile)
---
 README                 |  319 --------------------------------------------
 README.Linux           |  126 ------------------
 README.OSX             |   73 ----------
 build-scripts/Makefile |  346 ------------------------------------------------
 4 files changed, 0 insertions(+), 864 deletions(-)

diff --git a/README b/README
deleted file mode 100644
index f468921..0000000
--- a/README
+++ /dev/null
@@ -1,319 +0,0 @@
-Tor USB project
-===============
-
-Included applications
----------------------
-
-Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.1.28 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
-Polipo 1.0.4.1
-FirefoxPortable 3.6.13
- \_ Firefox 3.6.13
-    \_ Torbutton 1.2.5
-    \_ HTTPS Everywhere 0.9.9.development.2
-PidginPortable 2.7.4
- \_ Pidgin 2.7.5
-   \_ OTR 3.2
-
-Usage
------
-
-Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run
-this and point it to the install location. It will create a folder called "Tor
-Browser". This may be the hard disk, but is more likely the currently mounted
-USB drive. The install process needs only be performed once.
-
-Once the bundle is extracted, open the newly created folder and click
-"Start Tor Browser.bat" (may appear as simply "Start Tor Browser").
-This will start Vidalia. Once Tor has successfully opened a circuit,
-Firefox will automatically be opened.
-
-To exit, close Firefox. Vidalia will automatically clean up and exit.
-
-Changelog
----------
-
-0.0.1: Initial revision (2007-12-11)
-0.0.2: Update Vidalia to r2213 (2007-12-13)
-       Update Tor to 0.2.0.12-alpha
-       Add license files
-       Remove Portable Tor dependency
-       Add bookmarks to Tor, Torcheck and the hidden wiki
-0.0.3: Move build infrastructure to GNU Make (2007-12-16)
-       Install Torbutton
-0.0.4: Add internationalization for fa-IR and zh-CN
-       Add Makefile rule for installing Quick Locale Switcher, but
-       don't enable this by default
-0.0.5: Disable FirefoxPortable splash screen (2007-12-24)
-       New prefs.js:
-        - Disable history storage
-        - Disable <a ping> handling
-        - Disable session storage (crash recovery)
-        - Disable logging of CSS errors
-        - Disable persistent cookies
-        - Disable IPv6
-        - Disable external protocol handlers
-        - Disable failover to a secondary proxy
-        - Sanitize cookies and passwords on shutdown
-        - Prevent scripts calling plugins
-        - Empty add-on installation whitelist
-0.0.6: Released 2008-01-29
-       Rename start file "Start Tor Browser" so as to be easier to explain
-       Location of wget is now a configurable parameter
-       Vidalia updated to r2337 (for ProxyExecutable(Arguments) options
-       Tor updated to 0.2.0.18-alpha
-       Polipo 1.0.4 now included in bundle and Firefox configured
-       Firefox now configured to use proxies at 127.0.0.1 to prevent IPv6 attempt
-0.0.7: Released 2008-02-08
-       Security update of FirefoxPortable to v2.0.12 (see
-        http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox)
-0.0.8: Released 2008-02-15
-       Security update of Torbutton to v1.1.13 (see
-        http://torbutton.torproject.org/dev/CHANGELOG)
-       Automate generation of internationalized bundles
-       Allow optional extensions to be placed in build-scripts/extensions
-       Build Polipo with regular expression support, activating forbiddenFile option
-       Update Polipo configuration based on Incognito suggestions
-1.0.0: Released 2008-03-20
-       Fix parse errors in polipo.conf (Phillip)
-       Move to HTTPS and specify language in homepage URL (check.torproject.org)
-       Update Vidalia license
-       Fix Makefile error when re-building the bundle
-       Update of Tor to 0.2.0.22-rc
-       Update of Torbutton to v1.1.17 (see
-        http://torbutton.torproject.org/dev/CHANGELOG)
-       Update of Vidalia to revision 2424
-       Suppress warning on viewing an encrypted page
-1.0.1: Released 2008-03-26
-       Install .jar files placed in /extensions, as well as .xpi files
-       Update of Firefox to 2.0.0.13 to fix security problems (see
-        http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.13)
-       Update of Vidalia to revision 2464
-       Update of Tor to 0.2.0.23-rc
-       Update prefs.js for new Torbutton defaults
-1.0.2: Released 2008-05-03
-       Update Vidalia to revision 2539
-       Update Tor to 0.2.0.25-rc
-       Update FirefoxPortable to 2.0.0.14
-       Update Torbutton to 1.1.18
-       Add RunProxyAtStart to vidalia.conf (now required)
-1.0.3: Released 2008-05-16
-       Update Tor to 0.2.0.26-rc
-1.1.0: Released 2008-06-13
-       Replace startup batch script with application (RelativeLink), so there is a helpful icon
-       Make Qt 4.3.5 the default version
-       Optionally install Pidgin (for Tor IM Browser Bundle)
-       Extended INSTALL documentation
-       Optionally use WinRAR to produce a self-extracting split bundle
-       Update Vidalia to revision 2718
-       Update Tor to 0.2.1.1-alpha
-       Update OpenSSL to 0.9.8h
-1.1.1: Released 2008-07-20
-       Update Vidalia to release 0.1.6 (we now longer need to track SVN trunk)
-       Update Pidgin Portable to 2.4.3
-       Update Pidgin OTR plugin to 3.2
-       Update Tor to 0.2.1.2-alpha
-       Update Torbutton to 1.2.0rc6
-       Set TZ=UTC environment variable in RelativeLink (needed by Torbutton)
-1.1.2: Released 2008-08-09
-       Don't set TZ environment variable in RelativeLink (now done by Vidalia 0.1.7)
-       Update Vidalia to release 0.1.7
-       Update Tor to 0.2.1.4-alpha
-       Update Firefox to 2.0.0.16
-1.1.3: Released 2008-08-22
-       Fix homepage so that it is properly localized
-       Add &small=1 to homepage URL to request a more discreet page
-       Update Vidalia to release 0.1.8
-1.1.4: Released 2008-10-13
-       Update Vidalia to release 0.1.9
-       Update Tor to 0.2.1.6-alpha
-       Update Firefox to 2.0.0.16
-       Update Pidgin to 2.5.1
-1.1.5: Released 2008-12-01
-       Set AllowMultipleInstances=true, to allow Tor Browser Bundle and
-       Firefox to be run at the same time (suggested by John Brooks)
-       Update Vidalia to release 0.1.10
-       Update Firefox to 2.0.0.18
-       Update Tor to 0.2.1.7-alpha
-       Update Pidgin to 2.5.2
-       Added a small patch and instructions to fix Qt compile time error
-       Corrected some minor mistakes in the INSTALL document
-       Updated INSTALL document to reflect updated build process
-1.1.6: Released 2008-12-02
-       Set AllowMultipleInstances=false, this isn't ready for primetime
-1.1.7: Released 2008-12-12
-       Update Tor to 0.2.1.8-alpha
-       Fix issue with OTR (The Pidgin wasn't in the right directory) 
-       Update INSTALL document to reflect updated version numbers
-1.1.8: Released 2009-01-22
-       Update Tor to 0.2.1.11-alpha (security update)
-       Update OpenSSL to 0.9.8j (security update)
-       Update Firefox to 3.0.5
-       Update Pidgin to 2.5.4
-       Update libevent to 1.4.9
-
-1.1.9: Released 2009-02-18
-      Update Tor to 0.2.1.12-alpha
-      Update Firefox to 3.0.6
-      Update Vidalia to 0.1.11
-      
-1.1.10: Released 2009-03-10
-      Update Tor to 0.2.1.13-alpha
-      Update Firefox to 3.0.7
-      Update Pidgin to 2.5.5
-
-1.1.11: Released 2009-03-31
-      Update Firefox to 3.0.8
-      Add Italian language bundles
-      Update Torbutton to 1.2.1
-      Update Vidalia to 0.1.12
-
-1.1.12: Released 2009-04-12
-      Update OpenSSL to 0.9.8k
-      Update Tor to 0.2.1.14-rc
-
-1.2.0: Released 2009-05-25
-      Switch to launching Firefox directly from Vidalia to
-       allow multiple instances of Firefox
-      Update Firefox to 3.0.10
-      Update to Qt 4.5.1
-      Update Firefox prefs.js to stop scanning for plugins
-      Update libevent to 1.4.11
-      Include the Tor geoip database 
-      Update Vidalia to 0.1.13
-      Update Tor to 0.2.1.15-rc
-
-1.2.1: Released 2009-06-21
-    Better updates to Firefox to stop scanning for plugins on start
-    Update Pidgin to 2.5.6r2
-    Update Firefox to 3.0.11
-    Include OpenSSL 0.9.8k DLL and stop using the system ssl dll
-    Update Tor to 0.2.1.16-rc
-
-1.2.2: Released 2009-06-23
-    Update Pidgin to 2.5.7
-
-1.2.3: Released 2009-07-08
-  Update Vidalia to 0.1.14
-  Update Tor to 0.2.1.17-rc
-  Update Pidgin to 2.5.8
-
-1.2.4: Released 2009-07-11
-  Include libeay32.dll from OpenSSL 0.9.8k to make QT happy
-  Update Vidalia to 0.1.15
-
-1.2.5: Released 2009-07-25
-  update Tor to 0.2.1.18
-
-1.2.6: Released 2009-07-28
-  update Tor to 0.2.1.19
-
-1.2.7: Released 2009-08-04
-  update Firefox to 3.0.13
-  add Polish translation
-  update libevent to 1.4.12
-
-1.2.8: Released 2009-08-19
-  update Torbutton to 1.2.2
-  update Vidalia to 0.2.2
-  compile OpenSSL 0.9.8k with Visual C to make dlls
-  update Pidgin to 2.6.1
-
-1.2.9: Released 2009-09-11
-  update Vidalia to 0.2.4
-  update Qt to 4.5.2
-  update Pidgin to 2.6.2
-  update Firefox to 3.0.14
-
-1.2.10: Released 2009-11-20
-  update Vidalia to 0.2.6
-  update Pidgin to 2.6.3
-  update Tor to 0.2.1.20
-  update Firefox to 3.0.15
-  update OpenSSL to 0.9.8l
-  update libevent to 1.4.13
-
-1.3.0: Released 2009-12:31
-  upgrade Firefox to 3.5.6
-  update Pidgin to 2.6.4
-  update Torbutton to 1.2.4
-  update Tor to 0.2.1.21
-
-1.3.1: Released 2010-01-22
-  update Firefox to 3.5.7
-  update Pidgin to 2.6.5
-  update Tor to 0.2.1.22
-
-1.3.2: Released 2010-02-15
-  update Vidalia to 0.2.7
-  update Tor to 0.2.1.23
-  update Qt to 4.6.2
-  update Polipo to 1.4.0.1
-  configure pidgin to not log chats by default
-
-1.3.3: Released 2010-02-27
-  update Firefox to 3.5.8
-  update Pidgin to 2.6.6
-  update Tor to 0.2.1.24
-
-1.3.4: Released 2010-04-04
-  update Firefox to 3.5.9
-  update Tor to 0.2.1.25
-
-1.3.5: Released 2010-05-03
-  add Vietnamese language
-  update Torbutton to 1.2.5
-  update Tor to 0.2.1.26
-
-1.3.6: Released 2010-05-26
-  update Vidalia to 0.2.9
-
-1.3.7: Released 2010-07-04
-  update Pidgin to 2.7.1r2
-  update Firefox to 3.5.10
-
-1.3.8:  Released 2010-07-22
-  update Firefox to 3.5.11
-
-1.3.9: Released 2010-07-22
-  update Pidgin to 2.7.2
-
-1.3.10: Released 2010-09-28
-  update Vidalia to 0.2.10
-  update Firefox to 3.6.10
-  add new extensions:
-    Better Privacy 1.48.3
-    NoScript 2.0.3.2
-    HTTPS Everywhere 0.2.2
-
-1.3.11: Released 2010-10-25
-  update Firefox to 3.6.11
-  update Pidgin to 2.7.4
-
-1.3.12: Released 2010-10-28
-  update Firefox to 3.6.12
-
-1.3.13: Released 2010-11-25
-  update Tor to 0.2.1.27
-  update Pidgin to 2.7.5
-  update OpenSSL to 0.9.8p
-  fix Firefox extension install path so extensions show in the installed add-ons list
-  disable Firefox's ability to search the Windows registry path for system-wide
-    plugins and extensions (closes: #2118)
-  remove NoScript and BetterPrivacy from stable bundle until they receive more
-    testing
-
-1.3.14: Released 2010-12-13
-  update Firefox to 3.6.13
-  update HTTPS-Everywhere to 0.9.9.development.1
-    This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which 
-    prevented globally installed versions of the extensions from working. It also 
-    includes better protection from Firesheep. See the changelog here:
-    https://www.eff.org/files/Changelog.txt
-
-1.3.15: Released 2010-12-17
-  update Tor to 0.2.1.28
-  update HTTPS-Everywhere to 0.9.9.development.2
-
-1.3.16: Released 2010-01-09
- Update Firefox preferences to be more secure and disable geolocation to address #2338 
diff --git a/README.Linux b/README.Linux
deleted file mode 100644
index 6ce2244..0000000
--- a/README.Linux
+++ /dev/null
@@ -1,126 +0,0 @@
-Tor Browser Bundle for GNU/Linux
-===============
-
-Included applications
----------------------
-
-Vidalia 0.2.11-svn (with Qt 4.7.1)
-Tor 0.2.3.0-alpha-dev (with libevent-2.0.10, zlib-1.2.5 and openssl-1.0.0c) 
-Firefox 4.0b8
- \_ Torbutton 1.3.1-alpha
- |_ HTTPS Everywhere 0.9.9.development.2
-
-Usage
------
-
-Extract the bundle with:
-
-tar -xvzf tor-browser-gnu-linux*.tar.gz
-
-This will create a directory named tor-browser_LANG. Click on this directory or
-cd into it and execute the 'start-tor-browser' script. This will start Vidalia.
-Once Tor has successfully opened a circuit, Firefox will automatically be
-opened.
-
-To exit, close Firefox. Vidalia will automatically clean up and exit.
-
-Changelog
----------
-
-x.x.x:  NOT FOR PUBLIC RELEASE
-	THIS IS A TEST BUNDLE	
-
-1.1.2:  Released 2011-01-09
-        Update Firefox preferences to be more secure and disable geolocation to address #2338
-
-1.1.1:  Released 2010-12-17
-        Update Tor to 0.2.2.20-alpha
-        Update HTTPS Everywhere to 0.9.9.development.2
-
-1.1.0:  Released 2010-12-13
-        Update Firefox to 3.6.13
-        Update NoScript to 2.0.7
-        Update HTTPS Everywhere to 0.9.9.development.1
-          This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which 
-          prevented globally installed versions of the extension from working. It also 
-          includes better protection from Firesheep. See the changelog here:
-          https://www.eff.org/files/Changelog.txt
-        Add Chris Davis's patch <https://bugzilla.mozilla.org/show_bug.cgi?id=280661>
-          This patch improves Firefox's SOCKS support and eliminates the need for Polipo, so
-          Torbutton has been reconfigured to just use a SOCKS proxy. Polipo has been removed 
-          entirely from this release of the Tor Browser Bundle. If this causes you problems,
-          please file a bug: https://trac.torproject.org/projects/tor
-        Rebuild all binaries against glibc 2.7 so they work for older distros again
-
-1.0.17: Released 2010-11-24
-        Update Tor to 0.2.2.19-alpha
-
-1.0.16: Released 2010-11-16
-        Update Tor to 0.2.2.18-alpha
-        Update OpenSSL to 0.9.8p (see CVE-2010-3864)
-        Update NoScript to 2.0.5.1
-
-1.0.15: Released 2010-10-28
-        Update Firefox to 3.6.12
-
-1.0.14: Released 2010-10-24
-        Update Firefox to 3.6.11
-
-1.0.13: Released 2010-10-01
-        Update Tor to 0.2.2.17-alpha
-        Update Firefox to 3.6.10
-
-1.0.12: Released 2010-09-18
-        Update Tor to 0.2.2.16-alpha
-
-1.0.11: Released 2010-09-16
-        Update Firefox to 3.6.9
-        Update Vidalia to 0.2.10
-
-1.0.10: Released 2010-08-20
-        Update Tor to 0.2.2.15-alpha
-        Update Firefox to 3.6.8 
-          (Mozilla is not doing security and stability updates 
-           for 3.5.x after August 2010)
-        Update NoScript to 2.0.2.3
-        Update BetterPrivacy to 1.48.3
-        Update HTTPS Everywhere to 0.2.2        
-
-1.0.9:  Released 2010-07-13
-        Update Tor to 0.2.2.14-alpha
-
-1.0.8:  Released 2010-07-05
-        Update libpng to 1.4.3 (see CVE-2010-1205)
-        Update Firefox to 3.5.10
-        Update HTTPS Everywhere to 0.2.1
-
-1.0.7:  Released 2010-06-01
-        Rebuild everything against an older glibc so it'll run on more distros
-
-1.0.6:  Released 2010-05-31
-        Add arch to tarball name so there's no collision
-        Add libpng for Arch Linux
-        Add HTTPS Everywhere extension
-        Update Qt to 4.6.2
-        Update Vidalia to 0.2.9
-        Update NoScript to 1.9.9.80
-
-1.0.5:  Released 2010-05-15
-        Fix missing OpenSSL shared library bug
-        (thanks to bee at http://honeybeenet.altervista.org/homepage/)
-
-1.0.4:  Released 2010-04-24
-        Update Tor to 0.2.2.13-alpha
-
-1.0.3:  Released 2010-04-20
-        Update Tor to 0.2.2.12-alpha
-
-1.0.2:  Released 2010-04-18
-        Update Tor to 0.2.2.10-alpha
-        Update to Vidalia 0.2.8
-
-1.0.1:  Released 2010-04-08
-        Stop TBB from crashing when it tries to download files
-        Update Torbutton to 1.2.5
-
-1.0.0:  Initial release (2010-03-25)
diff --git a/README.OSX b/README.OSX
deleted file mode 100644
index 6116672..0000000
--- a/README.OSX
+++ /dev/null
@@ -1,73 +0,0 @@
-Tor Browser Bundle for Mac OS X
-===============
-
-Included applications
----------------------
-
-Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.22-alpha (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0c) 
-Firefox (Namoroka) 3.6.13
- \_ Torbutton 1.2.5
- |_ NoScript 2.0.9.3
- |_ HTTPS-Everywhere 0.9.9.development.2
- |_ BetterPrivacy 1.48.3
-
-Usage
------
-
-Unzip the TorBrowser zip file that you downloaded. Click on the
-TorBrowser_LANG.app inside will launch Vidalia and then Firefox.
-
-To exit, close Firefox and Vidalia.
-
-Changelog
----------
-
-1.2.0-libevent2: TESTING RELEASE: Released 2011-02-03
-       Test Tor Browser Bundle
-       Update Libevent to 2.0.10-stable
-       Update OpenSSL to 1.0.0c
-       Update zlib to 1.2.5
-       Remove polipo
-       This bundle will not work with OS X 10.4
-
-1.0.9: Released 2011-01-09
-       Update Firefox preferences to be more secure and disable geolocation to address #2338
-
-1.0.8: Released 2010-12-17
-       Update Tor to 0.2.2.20-alpha
-       Update HTTPS-Everywhere to 0.9.9.development.2
-
-1.0.7: Released 2010-12-14
-       Update Firefox to 3.6.13
-       Update NoScript to 2.0.7
-       Update HTTPS-Everywhere to 0.9.9.development.1
-         This version of HTTPS-Everywhere is patched to include a fix for bug #2096 which
-         prevented globally installed versions of the extension from working. It also
-         includes better protection from Firesheep. See the changelog here:
-         https://www.eff.org/files/Changelog.txt
-
-1.0.6: Released 2010-11-24
-       Update Tor to 0.2.2.19-alpha
-
-1.0.5: Released 2010-11-18
-       Update Tor to 0.2.2.18-alpha
-       Update OpenSSL to 0.9.8p (see CVE-2010-3864)
-       Update NoScript to 2.0.5.1
-
-1.0.4: Released 2010-10-28
-       Update Firefox to 3.6.12
-       Fix weird Torbutton location so users can tell it's installed
-
-1.0.3: Released 2010-10-25
-       Update Firefox to 3.6.11
-
-1.0.2: Released 2010-10-01
-       Update Tor to 0.2.2.17-alpha
-       Update Firefox to 3.6.10
-       Add BetterPrivacy 1.48.3
-
-1.0.1: Released 2010-09-18
-       Update Tor to 0.2.2.16-alpha
-
-1.0.0: Initial release (2010-09-15)
diff --git a/build-scripts/Makefile b/build-scripts/Makefile
deleted file mode 100644
index 82abf89..0000000
--- a/build-scripts/Makefile
+++ /dev/null
@@ -1,346 +0,0 @@
-###
-### Makefile for building Tor USB bundle
-###
-### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-### See LICENSE for licensing information
-###
-### $Id$
-###
-
-#####################
-### Configuration ###
-#####################
-
-## Location of required libraries
-MING=/c/c/mingw/bin
-QT=/c/Qt/4.6.2/bin
-OPENSSL=/e/build/openssl-0.9.8p/
-
-## Versions
-TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.6.13
-PIDGIN_VERSION=2.7.5
-
-## Location of bundle components
-VIDALIA=/e/build/vidalia-0.2.10
-TOR=/e/build/tor-0.2.1.28
-POLIPO=/e/build/polipo-1.0.4.1
-FIREFOX_SRC=/e/build/FirefoxPortable-3.6.13
-PIDGIN_SRC=/e/build/PidginPortable-2.7.5
-
-## Location of utility applications
-PWD:=$(shell pwd)
-PYTHON=/c/Python25/python.exe
-SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET=$(PYTHON) $(PWD)/pyget.py
-VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py
-WINRAR="/c/Program Files/WinRAR/WinRAR.exe"
-
-## Size of split archive volumes for WinRAR
-SPLITSIZE=1440k
-
-## Location of config files
-CONFIG_SRC=config
-
-## Destination for the generic bundle
-DEST="Generic Bundle"
-
-## Name of the bundle"
-NAME="Tor Browser"
-
-## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.16
-DEFAULT_COMPRESSED_BASENAME=tor-browser-
-IM_COMPRESSED_BASENAME=tor-im-browser-
-DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
-IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
-
-ifeq ($(USE_PIDGIN),1)
-COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
-else
-COMPRESSED_NAME=$(DEFAULT_COMPRESSED_NAME)
-endif
-
-## Extensions to install by default
-DEFAULT_EXTENSIONS=torbutton.xpi
-
-## Where to download Torbutton from
-#TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-latest.xpi?src=addondetail
-TORBUTTON=https://www.torproject.org/torbutton/releases/torbutton-$(TORBUTTON_VERSION).xpi
-
-## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VERSION)/win32/xpi
-
-## Where Farsi Language Pack can be downloaded from
-#FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/latest/3667/addon-3667-latest.xpi
-
-## Put more extensions here
-EXTENSIONS_DIR=extensions
-
-## Local overrides
--include local.makefile
-
-#############
-### Rules ###
-#############
-
-##
-## Default rule
-##
-
-bundle: bundle_en-US
-
-all-bundles-both:
-	USE_PIDGIN=1 make all-bundles
-	make clean
-	USE_PIDGIN=0 make all-bundles
-	make clean
-
-all-bundles: all-compressed-bundles all-split-bundles
-
-all-compressed-bundles: compressed-bundle_ar \
-	compressed-bundle_en-US \
-	compressed-bundle_de \
-	compressed-bundle_es-ES \
-	compressed-bundle_fa \
-	compressed-bundle_fr \
-	compressed-bundle_nl \
-	compressed-bundle_pl \
-	compressed-bundle_pt-PT \
-	compressed-bundle_ru \
-	compressed-bundle_zh-CN \
-	compressed-bundle_it \
-	compressed-bundle_vi
-
-all-split-bundles: split-bundle_ar \
-	split-bundle_en-US \
-	split-bundle_de \
-	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 \
-	split-bundle_vi
-
-##
-## Cleanup
-##
-
-clean:
-	rm -fr $(DEST) *.stamp
-	rm -f *~
-	rm -fr *.xpi *.jar
-	rm -fr $(NAME)_*
-	cd ../src/RelativeLink/ && $(MAKE) clean
-
-## Also remove the output files
-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
-##
-
-virus-scan:
-	$(VIRUSSCAN) $(VIDALIA)/build/src/vidalia/vidalia.exe
-	$(VIRUSSCAN) $(POLIPO)/polipo.exe
-	$(VIRUSSCAN) $(TOR)/src/or/tor.exe 
-	$(VIRUSSCAN) $(TOR)/src/tools/tor-resolve.exe
-
-##
-## Generate a non-localized bundle and put in $(DEST)
-##
-
-## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST)
-generic-bundle.stamp:
-	make generic-bundle
-generic-bundle: directory-structure install-binaries install-docs install-firefoxportable install-pidginportable configure-apps launcher
-	touch generic-bundle.stamp
-
-APPDIR=$(DEST)/App
-DOCSDIR=$(DEST)/Docs
-DATADIR=$(DEST)/Data
-
-## Build directory structure
-directory-structure: 
-	rm -fr $(DEST)
-	mkdir -p $(APPDIR)
-	mkdir -p $(DATADIR)/Tor
-	mkdir -p $(DATADIR)/Vidalia
-	mkdir -p $(DATADIR)/Polipo
-	mkdir -p $(DOCSDIR)
-
-## Package up all the Vidalia and Tor pre-requisites
-## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/>
-install-binaries: 
-	cp $(MING)/mingwm10.dll $(APPDIR)
-	cp $(MING)/libgnurx-0.dll $(APPDIR)
-	cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll $(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(QT)/libgcc_s_dw2-1.dll $(APPDIR) 
-	cp $(OPENSSL)/ssleay32.dll $(APPDIR)
-	cp $(OPENSSL)/libeay32.dll $(APPDIR)
-	cp $(VIDALIA)/build/src/vidalia/vidalia.exe $(APPDIR)
-	cp $(POLIPO)/polipo.exe $(APPDIR)
-	cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(APPDIR)
-
-## Collect up license files
-install-docs:
-	mkdir -p $(DOCSDIR)/Vidalia
-	mkdir -p $(DOCSDIR)/Tor
-	mkdir -p $(DOCSDIR)/Qt
-	mkdir -p $(DOCSDIR)/MinGW
-	mkdir -p $(DOCSDIR)/Polipo
-	cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia
-	cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor
-	cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt
-	cp $(MING)/../COPYING $(DOCSDIR)/MinGW
-	cp $(POLIPO)/COPYING  $(POLIPO)/README.Windows $(DOCSDIR)/Polipo
-	cp ../README $(DOCSDIR)/README-TorBrowserBundle
-
-## Copy over FirefoxPortable
-install-firefoxportable:
-	cp -R $(FIREFOX_SRC) $(DEST)/FirefoxPortable
-
-## Copy over PidginPortable
-install-pidginportable:
-ifeq ($(USE_PIDGIN),1)
-	cp -R $(PIDGIN_SRC) $(DEST)/PidginPortable
-endif
-
-## Configure Firefox, FirefoxPortable, Vidalia, Polipo and Tor
-configure-apps:
-	## Configure Firefox preferences
-	cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/
-	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
-	## Set up alternate launcher
-	mv $(DEST)/FirefoxPortable/App/Firefox/firefox.exe $(DEST)/FirefoxPortable/App/Firefox/tbb-firefox.exe
-	#rm $(DEST)/FirefoxPortable/FirefoxPortable.exe
-	## Configure FirefoxPortable
-	cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
-	cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings
-	## Configure PidginPortable
-ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
-	mkdir -p $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/prefs.xml $(DEST)/PidginPortable/Data/settings/.purple
-	cp $(CONFIG_SRC)/PidginPortableSettings.ini $(DEST)/PidginPortable/Data/settings
-endif
-	## Configure Vidalia
-ifeq ($(USE_PIDGIN),1)
-	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
-else
-	cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
-endif
-	## Configure Polipo
-	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo
-	## Configure Tor
-	cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor
-	cp $(TOR)/src/config/geoip $(DEST)/Data/Tor
-
-launcher:
-	#echo 'start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\' > $(DEST)/"Start Tor Browser.bat"
-	cd ../src/RelativeLink/ && $(MAKE)
-	cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe"
-
-##
-## How to create required extensions
-##
-
-## Torbutton development version
-torbutton.xpi:
-	$(WGET) -O $@ $(TORBUTTON)
-
-## Generic language pack rule
-langpack_%.xpi:
-	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
-## English comes as default
-langpack_en-US.xpi:
-	touch $@
-
-##
-## Customize the bundle
-##
-
-bundle_%:
-	LANGCODE=$* make bundle-localized
-compressed-bundle_%:
-	LANGCODE=$* make compressed-bundle-localized
-split-bundle_%:
-	LANGCODE=$* make split-bundle-localized
-
-bundle-localized_%.stamp:
-	make copy-files_$* install-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language
-	touch bundle-localized_$*.stamp
-
-bundle-localized: bundle-localized_$(LANGCODE).stamp
-
-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)_$*
-	cp -R $(DEST) $(NAME)_$*/$(NAME)
-
-BUNDLE=$(NAME)_$(LANGCODE)/$(NAME)
-DUMMYPROFILE=$(BUNDLE)/FirefoxPortable/App/DummyProfile
-install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
-	## Make a dummy profile to stop Firefox creating some large files
-	cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
-ifneq ($(LANGCODE), en-US)
-	mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\@firefox.mozilla.org.zip
-	$(SEVENZIP) x -o$(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\@firefox.mozilla.org $(BUNDLE)/FirefoxPortable/App/Firefox/extensions/langpack-$(LANGCODE)\@firefox.mozilla.org.zip
-endif
-	rm -fr $(DUMMYPROFILE)
-
-## Set the language for Vidalia
-patch-vidalia-language:
-	## Patch Vidalia
-	./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE)
-
-## Set the language for Pidgin
-patch-pidgin-language:
-	## Patch Pidgin
-ifeq ($(USE_PIDGIN),1)
-	./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \
-                                   $(BUNDLE)/PidginPortable/App/Pidgin/locale \
-                                   $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale
-endif
-
-patch-firefox-language:
-	## Patch Firefox prefs.js
-	./patch-firefox-language.sh $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js $(LANGCODE)
-
-###
-### Utilities
-###
-
-## Copy Firefox preferences from a run of FirefoxPortable to be the default
-apply-prefs:
-	cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC)
-
-## Export the source code of the bundle
-SRCNAME=$(COMPRESSED_NAME)
-SRCDEST=/tmp
-SRCDESTPATH=$(SRCDEST)/$(SRCNAME)
-srcdist:
-	rm -fr $(SRCDESTPATH)
-	git clone git://git.torproject.org/torbrowser.git \
-		$(SRCDESTPATH)
-	cd $(SRCDEST); tar --exclude src/archived-patches \
-		--exclude src/current-patches  --exclude src/processtest \
-		--exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)



More information about the tor-commits mailing list