[or-cvs] r22588: {} tag tor browser bundle 1.3.7. (in torbrowser/tags: . torbrowser-1_3_7 torbrowser-1_3_7/build-scripts)

Andrew Lewman andrew at torproject.org
Sun Jul 4 18:16:47 UTC 2010


Author: phobos
Date: 2010-07-04 18:16:47 +0000 (Sun, 04 Jul 2010)
New Revision: 22588

Added:
   torbrowser/tags/torbrowser-1_3_7/
   torbrowser/tags/torbrowser-1_3_7/README
   torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL
   torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile
Removed:
   torbrowser/tags/torbrowser-1_3_7/README
   torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL
   torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile
Log:
tag tor browser bundle 1.3.7.


Deleted: torbrowser/tags/torbrowser-1_3_7/README
===================================================================
--- torbrowser/trunk/README	2010-07-02 15:32:44 UTC (rev 22583)
+++ torbrowser/tags/torbrowser-1_3_7/README	2010-07-04 18:16:47 UTC (rev 22588)
@@ -1,272 +0,0 @@
-Tor USB project
-===============
-
-Included applications
----------------------
-
-Vidalia 0.2.9 (with Qt 4.6.2)
-Tor 0.2.1.26 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
-Polipo 1.0.4.1
-FirefoxPortable 3.5.10
- \_ Firefox 3.5.10
-    \_ Torbutton 1.2.5
-PidginPortable 2.7.1r2
- \_ Pidgin 2.7.1r2
-   \_ 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
-  update Pidgin to 2.7.1r2
-  update Firefox to 3.5.10

Copied: torbrowser/tags/torbrowser-1_3_7/README (from rev 22587, torbrowser/trunk/README)
===================================================================
--- torbrowser/tags/torbrowser-1_3_7/README	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_7/README	2010-07-04 18:16:47 UTC (rev 22588)
@@ -0,0 +1,272 @@
+Tor USB project
+===============
+
+Included applications
+---------------------
+
+Vidalia 0.2.9 (with Qt 4.6.2)
+Tor 0.2.1.26 (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8l) 
+Polipo 1.0.4.1
+FirefoxPortable 3.5.10
+ \_ Firefox 3.5.10
+    \_ Torbutton 1.2.5
+PidginPortable 2.7.1r2
+ \_ Pidgin 2.7.1r2
+   \_ 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

Deleted: torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL	2010-07-02 15:32:44 UTC (rev 22583)
+++ torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL	2010-07-04 18:16:47 UTC (rev 22588)
@@ -1,645 +0,0 @@
-###
-### Instructions for building Tor Browser Bundle components
-###
-### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-### Copyright 2008 The Tor Project <https://www.torproject.org/>
-### See LICENSE for licensing information
-###
-### $Id$
-###
-
-Contents
-========
-
-- Introduction to Building the Tor Browser Bundle
-- Install Subversion
-- Install 7zip
-- Install Python
-- Install MinGW (MinGW - Minimalist GNU for Windows)
-- Install MSYS
-- Install CMake
-- Install Qt
-- Install msysDTK
-- Install WinRAR
-- Building Polipo
-- Building zlib
-- Building OpenSSL
-- Building libevent
-- Building Tor
-- Building Vidalia
-- Unpacking PidginPortable
-- Building Firefox or Unpacking Firefox Portable
-- Customizing and Building the Tor Browser Bundle
-
-An Introduction to Building Tor Browser Bundle
-==============================================
-
-To build Tor Browser Bundle, you need to have built:
- Vidalia (in /c/build/vidalia-<version> by default)
- Tor (in /c/build/tor-<version> by default)
- Polipo (in /c/build/polipo-<version> by default)
-and have uncompressed Firefox Portable or produce a custom build Firefox
- FirefoxPortable (in /c/build/FirefoxPortable by default)
-
-Instructions for building Vidalia, Polipo and Tor are included below.
-
-As a prerequisite for all builds, we'll need a build directory:
-
-    cd C:\
-    C:\>mkdir build
-
-Vidalia needs to have the BrowserExecutable, ProxyExecutable,
-RunProxyAtStart and ProxyExecutableArguments options. Currently this
-is only available in the Vidalia trunk revision 2328 and later.
-
-Furthermore, you'll need to install many different software packages for the
-checkout and build process.  Sadly, many of these packages are unsigned and
-there is very little in the way of a chain of trust.
-
-Installing Subversion
-=====================
-
-To checkout the Tor Browser Bundle, you need Subversion.
-You can download and install the stock Subversion package:
-
-    http://subversion.tigris.org/getting.html
-
-Specifically you should use the pre-built packages. You can choose any from
-this list:
-
-    http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
-
-Or if you'd like a direct link, you can use this as it is tested and working
-for our purposes:
-
-    http://subversion.tigris.org/files/documents/15/41686/svn-1.4.6-setup.exe
-
-Alternatively, TortoiseSVN offers a graphical interface and integrates
-with Windows Explorer:
-
- http://tortoisesvn.tigris.org/
-
-Installing 7zip
-===============
-
-Download 7zip and install it. Possible choices for downloads are listed here:
-
-    http://www.7-zip.org/download.html
-
-Currently, 7-zip doesn't have package signatures, we requested this for current
-and future releases:
-
-    http://sourceforge.net/forum/message.php?msg_id=4982530
-
-The suggested version is "7-Zip 4.57":
-
-    http://downloads.sourceforge.net/sevenzip/7z457.exe
-
-Installing Python
-=================
-
-Either Python or wget is required to download Firefox extensions. Python is the
-suggested method.  To use Python, you'll need to download Python and install
-it. The suggested method is a pre-built Windows build.
-Download and install the following msi installer:
-
-    http://python.org/ftp/python/2.5.2/python-2.5.2.msi
-
-Download and verify the signature:
-
-    http://www.python.org/download/releases/2.5.2/python-2.5.2.msi.asc
-
-When prompted for a directory, install it into: C:\Python25\
-
-Installing MinGW
-(MinGW - Minimalist GNU for Windows)
-====================================
-
-You need to install MinGW and then MSYS.
-It's useful to read about these two projects:
-
-  http://www.mingw.org/
-
-For MinGW, download and run MinGW-5.1.6.
-You can find the proper release on Sourceforge:
-
-  http://sourceforge.net/projects/mingw/files/
-
-To download MinGW-5.1.6.exe, visit the following URL:
-
-  http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/MinGW%205.1.6/MinGW-5.1.6.exe/download
-
-Run MinGW-5.1.6.exe and begin the install. When prompted, select 'Full' as the
-type of install.  If you know better, select individual packages. It is
-expected that you will install MinGW into: C:\MinGW
-
-Installing MSYS
-===============
-
-For tar and other useful commands, you will also need MSYS. The current version
-of this is hellish to find.  In short, visit the MSYS Base System download
-page:
-
-  http://sourceforge.net/projects/mingw/files/
-
-The MSYS-1.0.11.exe download url is:
-
-  http://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
-
-Download and install MSYS-1.0.11.exe. When prompted, read the license agreement
-and other documentation.  When asked for an install path, choose: C:\msys\1.0
-
-You will be prompted to do a post install process that will "normalize" your
-MinGW environment with MSYS.  Agree to the prompt. You will hopefully see a
-prompt that says:
-
-    "Oh joy, you do not have C:MinGW/bin/make.exe. Keep it that way."
-
-Read the MSYS README. Understanding how to use MSYS is important.
-
-Now you'll need to fix your /etc/fstab because it is broken by default. Make it
-look like so:
-
-    Administrator at I-CF61A82488F14 /
-    $ cat /etc/fstab
-    C:\MinGW /mingw
-
-Once you have replaced the three old binaries you will be ready to actually do
-something useful.
-
-All of the rest of the build commands will take place inside of the MSYS Shell.
-Launch that now. It's found in:
-
-    Start Menu -> All Programs -> MinGW -> MSYS -> msys
-
-Installing GNU wget is optional. If you installed Python, you do not need to
-install wget.  It is not required as basic wget functionality is implemented in
-Python. Instructions for downloading, compiling and installing wget for MSYS
-can be found here:
-
-    http://www.mingw.org/MinGWiki/index.php/mingwPORT
-
-Installing CMake
-================
-
-We'll need CMake to build Vidalia.
-
-You can read about different versions on the CMake homepage:
-
-  http://cmake.org/
-
-Download version 2.8.0:
-
-  http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.exe
-
-Run the installer with Windows Explorer and install into:
-
-    'C:\Program Files\CMake 2.8'
-
-Installing Qt
-=============
-
-Download Qt 4.3 or later, we'll use 4.6.2:
-
-  http://qt.nokia.com/downloads/windows-cpp
-
-Download and run the installer with Windows Explorer:
-
-  http://get.qt.nokia.com/qt/source/qt-win-opensource-4.6.2-mingw.exe
-
-When prompted, install Qt into 'C:\Qt\4.6.2'
-You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
-You may have an error about win32api.h being not found. This is not true. You
-have win32api.h and Qt is wrong.  This is a result of the Qt installer not
-understanding how to count version numbers. This is probably fixed in newer
-versions of Qt. YMMV.
-
-Installing msysDTK
-==================
-
-In short, you'll now need to install the msysDTK:
-
-    http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe?download
-
-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
-==========================
-
-Now you'll download download the mingw autoconf-2.59 update:
-
-    http://prdownloads.sf.net/mingw/msys-autoconf-2.59.tar.bz2?download
-
-Extract the .tar.gz like so in your MSYS console:
-
-    tar -C / -xvjf /c/Documents\ and\ Settings/Administrator/Desktop/msys-autoconf-2.59.tar.bz2
-
-Building Polipo
-===============
-
-In order to enable the forbiddenFile functionality, the GNU Regex
-library is required. Download the -bin and -dev tarballs from:
-
-    http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=73286&release_id=140957
-
-Extract them both into you MinGW directory, e.g.
-
-    tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-bin.tar.gz
-    tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-dev.tar.gz
-
-Download Polipo sources:
-
-    http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz
-    http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz.asc
-
-Verify the PGP signature of the above files by following the developer directions:
-
-    http://www.pps.jussieu.fr/~jch/software/pgp-validating.html
-
-Unpack the Polipo source code into /c/build/polipo-1.0.4.1/ :
-
-    cd /c/build/
-    tar -C . -vxzf /c/Documents\ and\ Settings/Administrator/Desktop/polipo-1.0.4.1.tar.gz
-
-Download a Tor contributed Polipo specific Makefile:
-
-    https://svn.torproject.org/svn/tor/trunk/contrib/polipo/Makefile.mingw
-
-Replace the stock Polipo Makefile with the one above:
-
-    mv Makefile Makefile-dist-unused
-    mv /c/Documents\ and\ Settings/Administrator/Desktop/Makefile.mingw Makefile
-
-Now build Polipo:
-
-    make
-
-You should have a working binary. If you don't have gcc, it means your path is
-broken. Ensure you applied the aforementioned /etc/fstab suggestion.
-
-Building zlib
-=============
-
-Now we'll download zlib and install it.
-
-Download the zlib source:
-        http://www.zlib.net/zlib-1.2.3.tar.gz
-
-Currently, zlib doesn't have package signatures. We emailed the zlib team and are awaiting a reply.
-
-Extract zlib:
-        $ cd /c/build/
-        $ tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/zlib-1.2.3.tar.gz
-        $ cd zlib-1.2.3/
-
-Build it (we'll need this because we want zlib.a):
-        ./configure
-        make
-        make install
-
-Building OpenSSL
-================
-
-Download openssl:
-
-    http://www.openssl.org/source/openssl-0.9.8l.tar.gz
-
-Unpack it:
-
-    cd /c/build/
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8l.tar.gz
-
-You should see errors not unlike:
-
-    tar: openssl-0.9.8l/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
-    tar: openssl-0.9.8l/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
-    tar: openssl-0.9.8l/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
-    tar: Error exit delayed from previous errors
-
-Uncompressing OpenSSL shows a number of errors concerning symlinks. These do
-not appear to have caused a problem.
-
-Now configure the source package:
-
-    cd openssl-0.9.8l/
-    ./config -no-idea -no-rc5 -no-mdc2
-
-Edit '/c/build/openssl-0.9.8l/Makefile' and remove the "test:" and "tests:" sections that follow:
-
-    test:   tests
-
-    tests: rehash
-            @(cd test && echo "testing..." && \
-            $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DE
-    BUG_MEMORY=on tests );
-            util/opensslwrap.sh version -a
-
-Now remove things we don't need that interfere with the build process:
-
-        rm -rf ./test
-
-Now copy files we do need:
-
-        cd crypto/
-        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
-        cd ../ssl/
-        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
-        cd ..
-        cp *.h include/openssl/
-        cp fips/fips.h include/openssl/
-
-And finally, build it - this can take a long time and depends on the speed of your computer:
-
-        make
-        make install
-
-Building libevent
-=================
-
-Next, you'll want to download, unpack, build and install libevent (Version: libevent-1.4.13).
-You can get libevent here:
-
-        http://www.monkey.org/~provos/libevent/
-        http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
-        http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz.sig
-
-Verify the signature.
-
-Unpack it:
-
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/libevent-1.4.13-stable.tar.gz
-    cd libevent-1.4.13-stable/
-
-Configure, build and install:
-
-    ./configure --enable-static --disable-shared
-    make
-    make install
-
-Building Tor
-============
-
-Download, unpack, build and install Tor:
-        https://www.torproject.org/download.html
-        https://www.torproject.org/dist/tor-0.2.1.25.tar.gz
-        https://www.torproject.org/dist/tor-0.2.1.25.gz.asc
-        $ cd /c/build/
-        tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.1.25.tar.gz
-        $ cd tor-0.2.1.25/
-        ./configure
-        make
-
-Building Vidalia
-================
-
-To use QSslSocket for GeoIP lookups, install OpenSSL before building
-Vidalia (see above).
-
-Download Vidalia:
-
-    https://www.torproject.org/vidalia/dist/vidalia-0.2.7.tar.gz
-    https://www.torproject.org/vidalia/dist/vidalia-0.2.7.tar.gz.asc
-
-Verify the signature.
-
-Unpack Vidalia:
-
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.2.7.tar.gz
-    mv vidalia-0.2.7/ vidalia
-
-Set a proper environment:
-
-    cat << 'EOF' >> /etc/profile
-    export QTDIR="C:\Qt\4.6.2"
-    export PATH=$PATH:/c/Qt/4.6.2/bin
-    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/
-    export QMAKESPEC=win32-g++
-    EOF
-
-    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.6.2/bin/
-
-Create the proper MSYS Makefiles and don't forget the '.' at the end!
-
-    cd /c/build/vidalia
-    cmake -G "MSYS Makefiles" .
-
-You may see some errors:
-
-    -- Check size of int - done
-    -- Configuring done
-    CMake Warning (dev) at src/vidalia/CMakeLists.txt:229 (add_executable):
-      Policy CMP0003 should be set before this line.  Add code such as
-
-        if(COMMAND cmake_policy)
-          cmake_policy(SET CMP0003 NEW)
-        endif(COMMAND cmake_policy)
-
-      as early as possible but after the most recent call to
-      cmake_minimum_required or cmake_policy(VERSION).  This warning appears
-      because target "vidalia" links to some libraries for which the linker must
-      search:
-
-        imm32, winmm, ws2_32, ole32, oleaut32, uuid, winspool, ole32, oleaut32
-        uuid, winspool
-
-      and other libraries with known full path:
-
-        C:/Qt/4.5.2/lib/libQtGui4.a
-
-
-      CMake is adding directories in the second list to the linker search path in
-      case they are needed to find libraries from the first list (for backwards
-      compatibility with CMake 2.4).  Set policy CMP0003 to OLD or NEW to enable
-      or disable this behavior explicitly.  Run "cmake --help-policy CMP0003" for
-      more information.
-    This warning is for project developers.  Use -Wno-dev to suppress it.
-
-    -- Generating done
-    -- Build files have been written to: C:/build/vidalia
-
-This is OK. You can ignore these errors.
-
-Now you'll build Vidalia by running MSYS make:
-
-    cd /c/build/vidalia/
-    make
-
-Alternatively building under MinGW32
-====================================
-
-If you decide to not build with MSYS as mentioned above, you can use MinGW32 to build Vidalia.
-
-Qt and CMake must be in the %PATH%. An easy way to do this is to
-copy qtvars.bat and add the path to CMake. Then, copy the shortcut
-from the Start menu, and edit the path to point to the altered
-qtvars.bat
-
-Then run:
- > cmake -G "MinGW Makefiles" .
- > mingw32-make
-
-Patches for possible future inclusion
-=====================================
-
-A patch to close the Browser when Vidalia exits is in:
- ../src/current-patches/vidalia-killbrowser.patch
-
-This is not yet useful, since killing FirefoxPortable does not cause
-Firefox to exit. This patch has not yet been applied to Vidalia.
-
-Currently this is not being used by the Torbrowser.
-
-Further information
-===================
-
-Full instructions are in the Vidalia INSTALL file.
-
-Unpacking PidginPortable
-========================
-
-Download PidginPortable from:
- http://portableapps.com/apps/internet/pidgin_portable
-
-Also download the portable Pidgin-OTR plugin from the same page.
-
-Install both to C:\build\PidginPortable-<version>
-
-When installing Pidgin Portable, choose to install the extra language
-packs.
-
-Building Firefox
-================
-
-Currently the Tor Browser Bundle uses FirefoxPortable binaries.
-
-Download FirefoxPortable:
-
-    http://prdownloads.sourceforge.net/portableapps/FirefoxPortable_3.5.9_English.paf.exe
-
-Run the installer and select it into: 'C:\build\FirefoxPortable-<version>'
-
-If you use FirefoxPortable, you can skip past the following build steps and go directly to the customization section.
-
-Eventually it should use a custom build of Firefox. The following is a set of notes on building Firefox.
-
-Tested compilers for building Firefox
-=====================================
-
-MinGW32 cross compile under Linux:
- Failed to work (unsupported by Mozilla)
-MSVC 8 (Visual Studio .NET 2005):
- Failed to work (unsupported by Mozilla for Firefox 2, but should work
- for Firefox >=3)
- With some patches it may be possible to build Firefox 2:
-  http://georgedexter.wordpress.com/2007/03/03/building-firefox-2002-on-windows/
-MSVC 7.1 (Visual Studio .NET 2003):
- Works, provided  msvcp71.dll and msvcr71.dll are copied
-
-For more information see:
- http://developer.mozilla.org/en/docs/Windows_Build_Prerequisites
- http://developer.mozilla.org/en/docs/Build_and_Install
-
-Instructions building Firefox with MSVC 7.1
-===========================================
-
-- Install MSVC 7.1 (Visual Studio .NET 2003) and upgrade using Microsoft Update
-
-- Download Platform SDK from
-  http://www.microsoft.com/downloads/details.aspx?familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb
-
-- Install MozillaBuild from
-  http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.1.exe
-
-- Run e:\mozilla-build\start-msvc8.bat
-
-  $ cd "e:\mozilla\build"
-  $ tar -xjvf ../firefox-2.0.0.9-source.tar.bz2
-  $ cd mozilla
-  [ dot_mozconfg is in config/ ]
-  $ cp ../dot_mozconfig .mozconfig
-  $ make -f client.mk build
-
-- Copy msvcp71.dll and msvcr71.dll from "Microsot Visual Studio .NET 2003\Visual
-  Studio .NET Professional 2003 - English" to obj-i686-pc-mingw32\dist\bin
-
-- Add "msvcp71.dll" and "msvcr71.dll" to browser/installer/windows/packages-static
-
-$ make -C obj-i686-pc-mingw32/browser/installer
-
-Customization
-=============
-
-The locations of Qt, MinGW32, the Vidalia/Tor build directory, 7zip,
-FirefoxPortable can be altered in Makefile. The WGET variable should
-be either set to the location of a wget binary, or a command line for
-executing pyget.py under the installed Python interpreter.
-
-To install additional Firefox extensions, place the .xpi file in the
-build-scripts/extensions directory before building the bundle.
-
-Building the Tor Browser Bundle
-===============================
-
-Now you'll want to ensure you have the Tor Browser Bundle code checked out into C:\build\
-
-    C:\build>svn co https://svn.torproject.org/svn/torbrowser/
-
-Firefox must not be running while you are building the bundle.
-If you're using different versions than the Makefile, you'll want to patch the
-Makefile as mentioned in the Customization section above.
-
-An example to change the Qt Lib version:
-
-        From: QT=/c/Qt/4.6.2/bin
-        To: QT=/c/Qt/4.6.2/bin
-
-And then change the Tor version:
-
-        From: TOR=/c/build/tor-0.2.1.25
-        To: TOR=/c/build/tor-0.2.1.25
-
-Now you can run "make bundle_LANGUAGE", e.g. "make bundle_en-US".
-
-Alternatively, to build a compressed executable version, run "make
-compressed-bundle_LANGUAGE", e.g. "make compressed-bundle_de".
-
-Currently supported language codes are:
- - ar
- - en-US
- - de
- - es-ES
- - fa-IR
- - fr
- - it
- - nl
- - pl
- - pt-PT
- - ru
- - zh-CN
-
-New languages can be added by finding out the appropriate Mozilla
-language pack code from:
-
-    http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.18/win32/xpi
-
-If the Mozilla code differs from the Vidalia one, update
-patch-vidalia-language.sh accordingly.
-
-

Copied: torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL (from rev 22587, torbrowser/trunk/build-scripts/INSTALL)
===================================================================
--- torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_7/build-scripts/INSTALL	2010-07-04 18:16:47 UTC (rev 22588)
@@ -0,0 +1,646 @@
+###
+### Instructions for building Tor Browser Bundle components
+###
+### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
+### Copyright 2008 The Tor Project <https://www.torproject.org/>
+### See LICENSE for licensing information
+###
+### $Id$
+###
+
+Contents
+========
+
+- Introduction to Building the Tor Browser Bundle
+- Install Subversion
+- Install 7zip
+- Install Python
+- Install MinGW (MinGW - Minimalist GNU for Windows)
+- Install MSYS
+- Install CMake
+- Install Qt
+- Install msysDTK
+- Install WinRAR
+- Building Polipo
+- Building zlib
+- Building OpenSSL
+- Building libevent
+- Building Tor
+- Building Vidalia
+- Unpacking PidginPortable
+- Building Firefox or Unpacking Firefox Portable
+- Customizing and Building the Tor Browser Bundle
+
+An Introduction to Building Tor Browser Bundle
+==============================================
+
+To build Tor Browser Bundle, you need to have built:
+ Vidalia (in /c/build/vidalia-<version> by default)
+ Tor (in /c/build/tor-<version> by default)
+ Polipo (in /c/build/polipo-<version> by default)
+and have uncompressed Firefox Portable or produce a custom build Firefox
+ FirefoxPortable (in /c/build/FirefoxPortable by default)
+
+Instructions for building Vidalia, Polipo and Tor are included below.
+
+As a prerequisite for all builds, we'll need a build directory:
+
+    cd C:\
+    C:\>mkdir build
+
+Vidalia needs to have the BrowserExecutable, ProxyExecutable,
+RunProxyAtStart and ProxyExecutableArguments options. Currently this
+is only available in the Vidalia trunk revision 2328 and later.
+
+Furthermore, you'll need to install many different software packages for the
+checkout and build process.  Sadly, many of these packages are unsigned and
+there is very little in the way of a chain of trust.
+
+Installing Subversion
+=====================
+
+To checkout the Tor Browser Bundle, you need Subversion.
+You can download and install the stock Subversion package:
+
+    http://subversion.tigris.org/getting.html
+
+Specifically you should use the pre-built packages. You can choose any from
+this list:
+
+    http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
+
+Or if you'd like a direct link, you can use this as it is tested and working
+for our purposes:
+
+    http://subversion.tigris.org/files/documents/15/41686/svn-1.4.6-setup.exe
+
+Alternatively, TortoiseSVN offers a graphical interface and integrates
+with Windows Explorer:
+
+ http://tortoisesvn.tigris.org/
+
+Installing 7zip
+===============
+
+Download 7zip and install it. Possible choices for downloads are listed here:
+
+    http://www.7-zip.org/download.html
+
+Currently, 7-zip doesn't have package signatures, we requested this for current
+and future releases:
+
+    http://sourceforge.net/forum/message.php?msg_id=4982530
+
+The suggested version is "7-Zip 4.57":
+
+    http://downloads.sourceforge.net/sevenzip/7z457.exe
+
+Installing Python
+=================
+
+Either Python or wget is required to download Firefox extensions. Python is the
+suggested method.  To use Python, you'll need to download Python and install
+it. The suggested method is a pre-built Windows build.
+Download and install the following msi installer:
+
+    http://python.org/ftp/python/2.5.2/python-2.5.2.msi
+
+Download and verify the signature:
+
+    http://www.python.org/download/releases/2.5.2/python-2.5.2.msi.asc
+
+When prompted for a directory, install it into: C:\Python25\
+
+Installing MinGW
+(MinGW - Minimalist GNU for Windows)
+====================================
+
+You need to install MinGW and then MSYS.
+It's useful to read about these two projects:
+
+  http://www.mingw.org/
+
+For MinGW, download and run MinGW-5.1.6.
+You can find the proper release on Sourceforge:
+
+  http://sourceforge.net/projects/mingw/files/
+
+To download MinGW-5.1.6.exe, visit the following URL:
+
+  http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/MinGW%205.1.6/MinGW-5.1.6.exe/download
+
+Run MinGW-5.1.6.exe and begin the install. When prompted, select 'Full' as the
+type of install.  If you know better, select individual packages. It is
+expected that you will install MinGW into: C:\MinGW
+
+Installing MSYS
+===============
+
+For tar and other useful commands, you will also need MSYS. The current version
+of this is hellish to find.  In short, visit the MSYS Base System download
+page:
+
+  http://sourceforge.net/projects/mingw/files/
+
+The MSYS-1.0.11.exe download url is:
+
+  http://sourceforge.net/projects/mingw/files/MSYS%20Base%20System/msys-1.0.11/MSYS-1.0.11.exe/download
+
+Download and install MSYS-1.0.11.exe. When prompted, read the license agreement
+and other documentation.  When asked for an install path, choose: C:\msys\1.0
+
+You will be prompted to do a post install process that will "normalize" your
+MinGW environment with MSYS.  Agree to the prompt. You will hopefully see a
+prompt that says:
+
+    "Oh joy, you do not have C:MinGW/bin/make.exe. Keep it that way."
+
+Read the MSYS README. Understanding how to use MSYS is important.
+
+Now you'll need to fix your /etc/fstab because it is broken by default. Make it
+look like so:
+
+    Administrator at I-CF61A82488F14 /
+    $ cat /etc/fstab
+    C:\MinGW /mingw
+
+Once you have replaced the three old binaries you will be ready to actually do
+something useful.
+
+All of the rest of the build commands will take place inside of the MSYS Shell.
+Launch that now. It's found in:
+
+    Start Menu -> All Programs -> MinGW -> MSYS -> msys
+
+Installing GNU wget is optional. If you installed Python, you do not need to
+install wget.  It is not required as basic wget functionality is implemented in
+Python. Instructions for downloading, compiling and installing wget for MSYS
+can be found here:
+
+    http://www.mingw.org/MinGWiki/index.php/mingwPORT
+
+Installing CMake
+================
+
+We'll need CMake to build Vidalia.
+
+You can read about different versions on the CMake homepage:
+
+  http://cmake.org/
+
+Download version 2.8.0:
+
+  http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.exe
+
+Run the installer with Windows Explorer and install into:
+
+    'C:\Program Files\CMake 2.8'
+
+Installing Qt
+=============
+
+Download Qt 4.3 or later, we'll use 4.6.2:
+
+  http://qt.nokia.com/downloads/windows-cpp
+
+Download and run the installer with Windows Explorer:
+
+  http://get.qt.nokia.com/qt/source/qt-win-opensource-4.6.2-mingw.exe
+
+When prompted, install Qt into 'C:\Qt\4.6.2'
+You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
+You may have an error about win32api.h being not found. This is not true. You
+have win32api.h and Qt is wrong.  This is a result of the Qt installer not
+understanding how to count version numbers. This is probably fixed in newer
+versions of Qt. YMMV.
+
+Installing msysDTK
+==================
+
+In short, you'll now need to install the msysDTK:
+
+    http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe?download
+
+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
+==========================
+
+Now you'll download download the mingw autoconf-2.59 update:
+
+    http://prdownloads.sf.net/mingw/msys-autoconf-2.59.tar.bz2?download
+
+Extract the .tar.gz like so in your MSYS console:
+
+    tar -C / -xvjf /c/Documents\ and\ Settings/Administrator/Desktop/msys-autoconf-2.59.tar.bz2
+
+Building Polipo
+===============
+
+In order to enable the forbiddenFile functionality, the GNU Regex
+library is required. Download the -bin and -dev tarballs from:
+
+    http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=73286&release_id=140957
+
+Extract them both into you MinGW directory, e.g.
+
+    tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-bin.tar.gz
+    tar -C /c/MinGW/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/mingw-libgnurx-2.5.1-dev.tar.gz
+
+Download Polipo sources:
+
+    http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz
+    http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.0.4.1.tar.gz.asc
+
+Verify the PGP signature of the above files by following the developer directions:
+
+    http://www.pps.jussieu.fr/~jch/software/pgp-validating.html
+
+Unpack the Polipo source code into /c/build/polipo-1.0.4.1/ :
+
+    cd /c/build/
+    tar -C . -vxzf /c/Documents\ and\ Settings/Administrator/Desktop/polipo-1.0.4.1.tar.gz
+
+Download a Tor contributed Polipo specific Makefile:
+
+    https://svn.torproject.org/svn/tor/trunk/contrib/polipo/Makefile.mingw
+
+Replace the stock Polipo Makefile with the one above:
+
+    mv Makefile Makefile-dist-unused
+    mv /c/Documents\ and\ Settings/Administrator/Desktop/Makefile.mingw Makefile
+
+Now build Polipo:
+
+    make
+
+You should have a working binary. If you don't have gcc, it means your path is
+broken. Ensure you applied the aforementioned /etc/fstab suggestion.
+
+Building zlib
+=============
+
+Now we'll download zlib and install it.
+
+Download the zlib source:
+        http://www.zlib.net/zlib-1.2.3.tar.gz
+
+Currently, zlib doesn't have package signatures. We emailed the zlib team and are awaiting a reply.
+
+Extract zlib:
+        $ cd /c/build/
+        $ tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/zlib-1.2.3.tar.gz
+        $ cd zlib-1.2.3/
+
+Build it (we'll need this because we want zlib.a):
+        ./configure
+        make
+        make install
+
+Building OpenSSL
+================
+
+Download openssl:
+
+    http://www.openssl.org/source/openssl-0.9.8l.tar.gz
+
+Unpack it:
+
+    cd /c/build/
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8l.tar.gz
+
+You should see errors not unlike:
+
+    tar: openssl-0.9.8l/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
+    tar: openssl-0.9.8l/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
+    tar: openssl-0.9.8l/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
+    tar: Error exit delayed from previous errors
+
+Uncompressing OpenSSL shows a number of errors concerning symlinks. These do
+not appear to have caused a problem.
+
+Now configure the source package:
+
+    cd openssl-0.9.8l/
+    ./config -no-idea -no-rc5 -no-mdc2
+
+Edit '/c/build/openssl-0.9.8l/Makefile' and remove the "test:" and "tests:" sections that follow:
+
+    test:   tests
+
+    tests: rehash
+            @(cd test && echo "testing..." && \
+            $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DE
+    BUG_MEMORY=on tests );
+            util/opensslwrap.sh version -a
+
+Now remove things we don't need that interfere with the build process:
+
+        rm -rf ./test
+
+Now copy files we do need:
+
+        cd crypto/
+        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
+        cd ../ssl/
+        find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
+        cd ..
+        cp *.h include/openssl/
+        cp fips/fips.h include/openssl/
+
+And finally, build it - this can take a long time and depends on the speed of your computer:
+
+        make
+        make install
+
+Building libevent
+=================
+
+Next, you'll want to download, unpack, build and install libevent (Version: libevent-1.4.13).
+You can get libevent here:
+
+        http://www.monkey.org/~provos/libevent/
+        http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
+        http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz.sig
+
+Verify the signature.
+
+Unpack it:
+
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/libevent-1.4.13-stable.tar.gz
+    cd libevent-1.4.13-stable/
+
+Configure, build and install:
+
+    ./configure --enable-static --disable-shared
+    make
+    make install
+
+Building Tor
+============
+
+Download, unpack, build and install Tor:
+        https://www.torproject.org/download.html
+        https://www.torproject.org/dist/tor-0.2.1.26.tar.gz
+        https://www.torproject.org/dist/tor-0.2.1.26.gz.asc
+        $ cd /c/build/
+        tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.1.26.tar.gz
+        $ cd tor-0.2.1.26/
+        ./configure
+        make
+
+Building Vidalia
+================
+
+To use QSslSocket for GeoIP lookups, install OpenSSL before building
+Vidalia (see above).
+
+Download Vidalia:
+
+    https://www.torproject.org/vidalia/dist/vidalia-0.2.9.tar.gz
+    https://www.torproject.org/vidalia/dist/vidalia-0.2.9.tar.gz.asc
+
+Verify the signature.
+
+Unpack Vidalia:
+
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.2.9.tar.gz
+    mv vidalia-0.2.9/ vidalia
+
+Set a proper environment:
+
+    cat << 'EOF' >> /etc/profile
+    export QTDIR="C:\Qt\4.6.2"
+    export PATH=$PATH:/c/Qt/4.6.2/bin
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.8/bin/
+    export QMAKESPEC=win32-g++
+    EOF
+
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.8/bin/:/c/MinGW/bin/:/c/Qt/4.6.2/bin/
+
+Create the proper MSYS Makefiles and don't forget the '.' at the end!
+
+    cd /c/build/vidalia
+    cmake -G "MSYS Makefiles" .
+
+You may see some errors:
+
+    -- Check size of int - done
+    -- Configuring done
+    CMake Warning (dev) at src/vidalia/CMakeLists.txt:229 (add_executable):
+      Policy CMP0003 should be set before this line.  Add code such as
+
+        if(COMMAND cmake_policy)
+          cmake_policy(SET CMP0003 NEW)
+        endif(COMMAND cmake_policy)
+
+      as early as possible but after the most recent call to
+      cmake_minimum_required or cmake_policy(VERSION).  This warning appears
+      because target "vidalia" links to some libraries for which the linker must
+      search:
+
+        imm32, winmm, ws2_32, ole32, oleaut32, uuid, winspool, ole32, oleaut32
+        uuid, winspool
+
+      and other libraries with known full path:
+
+        C:/Qt/4.5.2/lib/libQtGui4.a
+
+
+      CMake is adding directories in the second list to the linker search path in
+      case they are needed to find libraries from the first list (for backwards
+      compatibility with CMake 2.4).  Set policy CMP0003 to OLD or NEW to enable
+      or disable this behavior explicitly.  Run "cmake --help-policy CMP0003" for
+      more information.
+    This warning is for project developers.  Use -Wno-dev to suppress it.
+
+    -- Generating done
+    -- Build files have been written to: C:/build/vidalia
+
+This is OK. You can ignore these errors.
+
+Now you'll build Vidalia by running MSYS make:
+
+    cd /c/build/vidalia/
+    make
+
+Alternatively building under MinGW32
+====================================
+
+If you decide to not build with MSYS as mentioned above, you can use MinGW32 to build Vidalia.
+
+Qt and CMake must be in the %PATH%. An easy way to do this is to
+copy qtvars.bat and add the path to CMake. Then, copy the shortcut
+from the Start menu, and edit the path to point to the altered
+qtvars.bat
+
+Then run:
+ > cmake -G "MinGW Makefiles" .
+ > mingw32-make
+
+Patches for possible future inclusion
+=====================================
+
+A patch to close the Browser when Vidalia exits is in:
+ ../src/current-patches/vidalia-killbrowser.patch
+
+This is not yet useful, since killing FirefoxPortable does not cause
+Firefox to exit. This patch has not yet been applied to Vidalia.
+
+Currently this is not being used by the Torbrowser.
+
+Further information
+===================
+
+Full instructions are in the Vidalia INSTALL file.
+
+Unpacking PidginPortable
+========================
+
+Download PidginPortable from:
+ http://portableapps.com/apps/internet/pidgin_portable
+
+Also download the portable Pidgin-OTR plugin from the same page.
+
+Install both to C:\build\PidginPortable-<version>
+
+When installing Pidgin Portable, choose to install the extra language
+packs.
+
+Building Firefox
+================
+
+Currently the Tor Browser Bundle uses FirefoxPortable binaries.
+
+Download FirefoxPortable:
+
+    http://prdownloads.sourceforge.net/portableapps/FirefoxPortable_3.5.10_English.paf.exe
+
+Run the installer and select it into: 'C:\build\FirefoxPortable-<version>'
+
+If you use FirefoxPortable, you can skip past the following build steps and go directly to the customization section.
+
+Eventually it should use a custom build of Firefox. The following is a set of notes on building Firefox.
+
+Tested compilers for building Firefox
+=====================================
+
+MinGW32 cross compile under Linux:
+ Failed to work (unsupported by Mozilla)
+MSVC 8 (Visual Studio .NET 2005):
+ Failed to work (unsupported by Mozilla for Firefox 2, but should work
+ for Firefox >=3)
+ With some patches it may be possible to build Firefox 2:
+  http://georgedexter.wordpress.com/2007/03/03/building-firefox-2002-on-windows/
+MSVC 7.1 (Visual Studio .NET 2003):
+ Works, provided  msvcp71.dll and msvcr71.dll are copied
+
+For more information see:
+ http://developer.mozilla.org/en/docs/Windows_Build_Prerequisites
+ http://developer.mozilla.org/en/docs/Build_and_Install
+
+Instructions building Firefox with MSVC 7.1
+===========================================
+
+- Install MSVC 7.1 (Visual Studio .NET 2003) and upgrade using Microsoft Update
+
+- Download Platform SDK from
+  http://www.microsoft.com/downloads/details.aspx?familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb
+
+- Install MozillaBuild from
+  http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.1.exe
+
+- Run e:\mozilla-build\start-msvc8.bat
+
+  $ cd "e:\mozilla\build"
+  $ tar -xjvf ../firefox-2.0.0.9-source.tar.bz2
+  $ cd mozilla
+  [ dot_mozconfg is in config/ ]
+  $ cp ../dot_mozconfig .mozconfig
+  $ make -f client.mk build
+
+- Copy msvcp71.dll and msvcr71.dll from "Microsot Visual Studio .NET 2003\Visual
+  Studio .NET Professional 2003 - English" to obj-i686-pc-mingw32\dist\bin
+
+- Add "msvcp71.dll" and "msvcr71.dll" to browser/installer/windows/packages-static
+
+$ make -C obj-i686-pc-mingw32/browser/installer
+
+Customization
+=============
+
+The locations of Qt, MinGW32, the Vidalia/Tor build directory, 7zip,
+FirefoxPortable can be altered in Makefile. The WGET variable should
+be either set to the location of a wget binary, or a command line for
+executing pyget.py under the installed Python interpreter.
+
+To install additional Firefox extensions, place the .xpi file in the
+build-scripts/extensions directory before building the bundle.
+
+Building the Tor Browser Bundle
+===============================
+
+Now you'll want to ensure you have the Tor Browser Bundle code checked out into C:\build\
+
+    C:\build>svn co https://svn.torproject.org/svn/torbrowser/
+
+Firefox must not be running while you are building the bundle.
+If you're using different versions than the Makefile, you'll want to patch the
+Makefile as mentioned in the Customization section above.
+
+An example to change the Qt Lib version:
+
+        From: QT=/c/Qt/4.6.2/bin
+        To: QT=/c/Qt/4.6.2/bin
+
+And then change the Tor version:
+
+        From: TOR=/c/build/tor-0.2.1.26
+        To: TOR=/c/build/tor-0.2.1.26
+
+Now you can run "make bundle_LANGUAGE", e.g. "make bundle_en-US".
+
+Alternatively, to build a compressed executable version, run "make
+compressed-bundle_LANGUAGE", e.g. "make compressed-bundle_de".
+
+Currently supported language codes are:
+ - ar
+ - en-US
+ - de
+ - es-ES
+ - fa-IR
+ - fr
+ - it
+ - nl
+ - pl
+ - pt-PT
+ - ru
+ - vi
+ - zh-CN
+
+New languages can be added by finding out the appropriate Mozilla
+language pack code from:
+
+    http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.5.10/win32/xpi
+
+If the Mozilla code differs from the Vidalia one, update
+patch-vidalia-language.sh accordingly.
+
+

Deleted: torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2010-07-02 15:32:44 UTC (rev 22583)
+++ torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile	2010-07-04 18:16:47 UTC (rev 22588)
@@ -1,336 +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/MinGW/bin
-QT=/c/Qt/4.6.2/bin
-OPENSSL=/c/build/openssl-0.9.8l/bin
-
-## Versions
-TORBUTTON_VERSION=1.2.5
-FIREFOX_VERSION=3.5.10
-PIDGIN_VERSION=2.7.1r2
-
-## Location of bundle components
-VIDALIA=/c/build/vidalia-0.2.9
-TOR=/c/build/tor-0.2.1.26
-POLIPO=/c/build/polipo-1.0.4.1
-FIREFOX_SRC=/c/build/FirefoxPortable-$(FIREFOX_VERSION)
-PIDGIN_SRC=/c/build/PidginPortable-$(PIDGIN_VERSION)
-
-## Location of utility applications
-SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET:=/c/Python25/python.exe $(shell pwd)/pyget.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.7-dev
-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
-
-##
-## 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)/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 $(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: $(DEFAULT_EXTENSIONS) langpack_$(LANGCODE).xpi
-	## Make a dummy profile to stop Firefox creating some large files
-	cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
-	## Install default extensions and everything from extensions directory
-	for extension in langpack_$(LANGCODE).xpi $(DEFAULT_EXTENSIONS) $(EXTENSIONS_DIR)/*.xpi $(EXTENSIONS_DIR)/*.jar; \
-	  do $(BUNDLE)/FirefoxPortable/App/firefox/tbb-firefox.exe \
-             -profile $(DUMMYPROFILE)/profile \
-             -install-global-extension $$extension; \
-          done
-	## Delete the dummy profile
-	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/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)
-	svn export https://svn.torproject.org/svn/torbrowser/trunk/ \
-                   $(SRCDESTPATH)
-	cd $(SRCDEST); tar --exclude src/archived-patches \
-                           --exclude src/current-patches  --exclude src/processtest \
-                           -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)

Copied: torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile (from rev 22587, torbrowser/trunk/build-scripts/Makefile)
===================================================================
--- torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_7/build-scripts/Makefile	2010-07-04 18:16:47 UTC (rev 22588)
@@ -0,0 +1,336 @@
+###
+### 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/MinGW/bin
+QT=/c/Qt/4.6.2/bin
+OPENSSL=/c/build/openssl-0.9.8l/bin
+
+## Versions
+TORBUTTON_VERSION=1.2.5
+FIREFOX_VERSION=3.5.10
+PIDGIN_VERSION=2.7.1r2
+
+## Location of bundle components
+VIDALIA=/c/build/vidalia-0.2.9
+TOR=/c/build/tor-0.2.1.26
+POLIPO=/c/build/polipo-1.0.4.1
+FIREFOX_SRC=/c/build/FirefoxPortable
+PIDGIN_SRC=/c/build/PidginPortable
+
+## Location of utility applications
+SEVENZIP="/c/Program Files/7-Zip/7z.exe"
+WGET:=/c/Python25/python.exe $(shell pwd)/pyget.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.7
+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
+
+##
+## 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)/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 $(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: $(DEFAULT_EXTENSIONS) langpack_$(LANGCODE).xpi
+	## Make a dummy profile to stop Firefox creating some large files
+	cp -R $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
+	## Install default extensions and everything from extensions directory
+	for extension in langpack_$(LANGCODE).xpi $(DEFAULT_EXTENSIONS) $(EXTENSIONS_DIR)/*.xpi $(EXTENSIONS_DIR)/*.jar; \
+	  do $(BUNDLE)/FirefoxPortable/App/firefox/tbb-firefox.exe \
+             -profile $(DUMMYPROFILE)/profile \
+             -install-global-extension $$extension; \
+          done
+	## Delete the dummy profile
+	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)
+	svn export https://svn.torproject.org/svn/torbrowser/trunk/ \
+                   $(SRCDESTPATH)
+	cd $(SRCDEST); tar --exclude src/archived-patches \
+                           --exclude src/current-patches  --exclude src/processtest \
+                           -czvf $(SRCNAME)-src.tar.gz $(SRCNAME)



More information about the tor-commits mailing list