[or-cvs] r22675: {torbrowser} tag tbb 1.3.9 and bump to 1.3.10-dev (in torbrowser: tags tags/torbrowser-1_3_9 tags/torbrowser-1_3_9/build-scripts tags/torbrowser-1_3_9/build-scripts/config trunk trunk/build-scripts)

Andrew Lewman andrew at torproject.org
Thu Jul 22 21:15:10 UTC 2010


Author: phobos
Date: 2010-07-22 21:15:10 +0000 (Thu, 22 Jul 2010)
New Revision: 22675

Added:
   torbrowser/tags/torbrowser-1_3_9/
   torbrowser/tags/torbrowser-1_3_9/README
   torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile
   torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js
Removed:
   torbrowser/tags/torbrowser-1_3_9/README
   torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile
   torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js
Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/Makefile
Log:
tag tbb 1.3.9 and bump to 1.3.10-dev


Deleted: torbrowser/tags/torbrowser-1_3_9/README
===================================================================
--- torbrowser/trunk/README	2010-07-22 08:52:36 UTC (rev 22669)
+++ torbrowser/tags/torbrowser-1_3_9/README	2010-07-22 21:15:10 UTC (rev 22675)
@@ -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 2010-07-04
-  update Pidgin to 2.7.1r2
-  update Firefox to 3.5.10

Copied: torbrowser/tags/torbrowser-1_3_9/README (from rev 22674, torbrowser/trunk/README)
===================================================================
--- torbrowser/tags/torbrowser-1_3_9/README	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_9/README	2010-07-22 21:15:10 UTC (rev 22675)
@@ -0,0 +1,278 @@
+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.11
+ \_ Firefox 3.5.10
+    \_ Torbutton 1.2.5
+PidginPortable 2.7.2
+ \_ Pidgin 2.7.2
+   \_ 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

Deleted: torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2010-07-22 08:52:36 UTC (rev 22669)
+++ torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile	2010-07-22 21:15:10 UTC (rev 22675)
@@ -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
-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.8-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/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)

Copied: torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile (from rev 22674, torbrowser/trunk/build-scripts/Makefile)
===================================================================
--- torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_9/build-scripts/Makefile	2010-07-22 21:15:10 UTC (rev 22675)
@@ -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.11
+PIDGIN_VERSION=2.7.2
+
+## 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.9
+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)

Deleted: torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/prefs.js	2010-07-22 08:52:36 UTC (rev 22669)
+++ torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js	2010-07-22 21:15:10 UTC (rev 22675)
@@ -1,123 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the application is running,
- * the changes will be overwritten when the application exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("app.update.auto", false);
-user_pref("app.update.enabled", false);
-user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
-user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
-user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
-user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
-user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
-user_pref("browser.cache.disk.capacity", 0);
-user_pref("browser.cache.disk.enable", false);
-user_pref("browser.download.manager.retention", 0);
-user_pref("browser.download.useDownloadDir", false);
-user_pref("browser.formfill.enable", false);
-user_pref("browser.migration.version", 1);
-user_pref("browser.places.importBookmarksHTML", false);
-user_pref("browser.places.importDefaults", false);
-user_pref("browser.places.leftPaneFolderId", -1);
-user_pref("browser.places.migratePostDataAnnotations", false);
-user_pref("browser.places.smartBookmarksVersion", 1);
-user_pref("browser.places.updateRecentTagsUri", false);
-user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.privatebrowsing.autostart", true);
-user_pref("browser.rights.3.shown", true);
-user_pref("browser.safebrowsing.enabled", false);
-user_pref("browser.safebrowsing.malware.enabled", false);
-user_pref("browser.search.suggest.enabled", false);
-user_pref("browser.search.update", false);
-user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.10");
-user_pref("dom.storage.enabled", false);
-user_pref("extensions.checkCompatibility", false);
-user_pref("extensions.checkUpdateSecurity", false);
-user_pref("extensions.lastAppVersion", "3.5.10");
-user_pref("extensions.torbutton.fresh_install", false);
-user_pref("extensions.torbutton.http_port", 8118);
-user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.https_port", 8118);
-user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.locked_mode", true);
-user_pref("extensions.torbutton.proxies_applied", true);
-user_pref("extensions.torbutton.restore_tor", true);
-user_pref("extensions.torbutton.saved.auto_update", false);
-user_pref("extensions.torbutton.saved.share_proxy_settings", false);
-user_pref("extensions.torbutton.saved.socks_version", 5);
-user_pref("extensions.torbutton.settings_applied", true);
-user_pref("extensions.torbutton.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.socks_port", 9050);
-user_pref("extensions.torbutton.tor_enabled", true);
-user_pref("extensions.torbutton.tor_memory_jar", true);
-user_pref("extensions.update.enabled", false);
-user_pref("extensions.update.notifyUser", false);
-user_pref("general.appname.override", "Netscape");
-user_pref("general.appversion.override", "5.0 (Windows; en-US)");
-user_pref("general.buildID.override", "0");
-user_pref("general.oscpu.override", "Windows NT 5.1");
-user_pref("general.platform.override", "Win32");
-user_pref("general.productSub.override", "20080404");
-user_pref("general.useragent.locale", "BUNDLELOCALE");
-user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20080404 Firefox/3.5.10");
-user_pref("general.useragent.vendor", "");
-user_pref("general.useragent.vendorSub", "");
-user_pref("intl.accept_languages", "en-us, en");
-user_pref("intl.charsetmenu.browser.cache", "UTF-8");
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("network.cookie.lifetimePolicy", 2);
-user_pref("network.cookie.prefsMigrated", true);
-user_pref("network.protocol-handler.warn-external.mailto", true);
-user_pref("network.protocol-handler.warn-external.news", true);
-user_pref("network.protocol-handler.warn-external.nntp", true);
-user_pref("network.protocol-handler.warn-external.snews", true);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 8118);
-user_pref("network.proxy.socks", "127.0.0.1");
-user_pref("network.proxy.socks_port", 9050);
-user_pref("network.proxy.socks_remote_dns", true);
-user_pref("network.proxy.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 8118);
-user_pref("network.proxy.type", 1);
-user_pref("network.security.ports.banned", "8118,8123,9050,9051");
-user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
-user_pref("plugin.scan.Acrobat", "99.0");
-user_pref("plugin.scan.Quicktime", "99.0");
-user_pref("plugin.scan.SunJRE", "99.0");
-user_pref("plugin.scan.WindowsMediaPlayer", "99.0");
-user_pref("plugin.scan.plid.all", false);
-user_pref("plugin.scan.4xPluginFolder", false);
-user_pref("security.enable_java", false);
-user_pref("signon.rememberSignons", false);
-user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825);
-user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
-user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
-user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");
-user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
-user_pref("browser.microsummary.updateGenerators", false);
-user_pref("network.hosts.pop_server", "");
-user_pref("browser.sessionstore.privacy_level", 2);
-user_pref("browser.chrome.site_icons", false);
-user_pref("browser.chrome.favicons", false);
-user_pref("browser.chrome.image_icons.max_size", 0);
-user_pref("browser.download.manager.retention", 1);
-user_pref("browser.send_pings", false);
-user_pref("dom.event.contextmenu.enabled", false);
-user_pref("browser.urlbar.autocomplete.enabled", false);
-user_pref("plugin.expose_full_path", true);
-user_pref("network.protocol-handler.external-default", false);
-user_pref("network.protocol-handler.external.mailto", false);
-user_pref("network.protocol-handler.external.news", false);
-user_pref("network.protocol-handler.external.nntp", false);
-user_pref("network.protocol-handler.external.snews", false);
-user_pref("browser.history_expire_days", 0);
-user_pref("browser.history_expire_days.mirror", 0);

Copied: torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js (from rev 22670, torbrowser/trunk/build-scripts/config/prefs.js)
===================================================================
--- torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js	                        (rev 0)
+++ torbrowser/tags/torbrowser-1_3_9/build-scripts/config/prefs.js	2010-07-22 21:15:10 UTC (rev 22675)
@@ -0,0 +1,123 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("app.update.auto", false);
+user_pref("app.update.enabled", false);
+user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
+user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
+user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
+user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
+user_pref("browser.cache.disk.capacity", 0);
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.download.manager.retention", 0);
+user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.formfill.enable", false);
+user_pref("browser.migration.version", 1);
+user_pref("browser.places.importBookmarksHTML", false);
+user_pref("browser.places.importDefaults", false);
+user_pref("browser.places.leftPaneFolderId", -1);
+user_pref("browser.places.migratePostDataAnnotations", false);
+user_pref("browser.places.smartBookmarksVersion", 1);
+user_pref("browser.places.updateRecentTagsUri", false);
+user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.privatebrowsing.autostart", true);
+user_pref("browser.rights.3.shown", true);
+user_pref("browser.safebrowsing.enabled", false);
+user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.search.suggest.enabled", false);
+user_pref("browser.search.update", false);
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.11");
+user_pref("dom.storage.enabled", false);
+user_pref("extensions.checkCompatibility", false);
+user_pref("extensions.checkUpdateSecurity", false);
+user_pref("extensions.lastAppVersion", "3.5.11");
+user_pref("extensions.torbutton.fresh_install", false);
+user_pref("extensions.torbutton.http_port", 8118);
+user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.https_port", 8118);
+user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.locked_mode", true);
+user_pref("extensions.torbutton.proxies_applied", true);
+user_pref("extensions.torbutton.restore_tor", true);
+user_pref("extensions.torbutton.saved.auto_update", false);
+user_pref("extensions.torbutton.saved.share_proxy_settings", false);
+user_pref("extensions.torbutton.saved.socks_version", 5);
+user_pref("extensions.torbutton.settings_applied", true);
+user_pref("extensions.torbutton.socks_host", "127.0.0.1");
+user_pref("extensions.torbutton.socks_port", 9050);
+user_pref("extensions.torbutton.tor_enabled", true);
+user_pref("extensions.torbutton.tor_memory_jar", true);
+user_pref("extensions.update.enabled", false);
+user_pref("extensions.update.notifyUser", false);
+user_pref("general.appname.override", "Netscape");
+user_pref("general.appversion.override", "5.0 (Windows; en-US)");
+user_pref("general.buildID.override", "0");
+user_pref("general.oscpu.override", "Windows NT 5.1");
+user_pref("general.platform.override", "Win32");
+user_pref("general.productSub.override", "20080404");
+user_pref("general.useragent.locale", "BUNDLELOCALE");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20080404 Firefox/3.5.11");
+user_pref("general.useragent.vendor", "");
+user_pref("general.useragent.vendorSub", "");
+user_pref("intl.accept_languages", "en-us, en");
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+user_pref("network.cookie.cookieBehavior", 1);
+user_pref("network.cookie.lifetimePolicy", 2);
+user_pref("network.cookie.prefsMigrated", true);
+user_pref("network.protocol-handler.warn-external.mailto", true);
+user_pref("network.protocol-handler.warn-external.news", true);
+user_pref("network.protocol-handler.warn-external.nntp", true);
+user_pref("network.protocol-handler.warn-external.snews", true);
+user_pref("network.proxy.http", "127.0.0.1");
+user_pref("network.proxy.http_port", 8118);
+user_pref("network.proxy.socks", "127.0.0.1");
+user_pref("network.proxy.socks_port", 9050);
+user_pref("network.proxy.socks_remote_dns", true);
+user_pref("network.proxy.ssl", "127.0.0.1");
+user_pref("network.proxy.ssl_port", 8118);
+user_pref("network.proxy.type", 1);
+user_pref("network.security.ports.banned", "8118,8123,9050,9051");
+user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
+user_pref("plugin.scan.Acrobat", "99.0");
+user_pref("plugin.scan.Quicktime", "99.0");
+user_pref("plugin.scan.SunJRE", "99.0");
+user_pref("plugin.scan.WindowsMediaPlayer", "99.0");
+user_pref("plugin.scan.plid.all", false);
+user_pref("plugin.scan.4xPluginFolder", false);
+user_pref("security.enable_java", false);
+user_pref("signon.rememberSignons", false);
+user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825);
+user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
+user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
+user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");
+user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
+user_pref("browser.microsummary.updateGenerators", false);
+user_pref("network.hosts.pop_server", "");
+user_pref("browser.sessionstore.privacy_level", 2);
+user_pref("browser.chrome.site_icons", false);
+user_pref("browser.chrome.favicons", false);
+user_pref("browser.chrome.image_icons.max_size", 0);
+user_pref("browser.download.manager.retention", 1);
+user_pref("browser.send_pings", false);
+user_pref("dom.event.contextmenu.enabled", false);
+user_pref("browser.urlbar.autocomplete.enabled", false);
+user_pref("plugin.expose_full_path", true);
+user_pref("network.protocol-handler.external-default", false);
+user_pref("network.protocol-handler.external.mailto", false);
+user_pref("network.protocol-handler.external.news", false);
+user_pref("network.protocol-handler.external.nntp", false);
+user_pref("network.protocol-handler.external.snews", false);
+user_pref("browser.history_expire_days", 0);
+user_pref("browser.history_expire_days.mirror", 0);

Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2010-07-22 20:48:54 UTC (rev 22674)
+++ torbrowser/trunk/README	2010-07-22 21:15:10 UTC (rev 22675)
@@ -274,5 +274,7 @@
 1.3.8:  Released 2010-07-22
   update Firefox to 3.5.11
 
-1.3.9: Released
+1.3.9: Released 2010-07-22
   update Pidgin to 2.7.2
+
+1.3.10: Released

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2010-07-22 20:48:54 UTC (rev 22674)
+++ torbrowser/trunk/build-scripts/Makefile	2010-07-22 21:15:10 UTC (rev 22675)
@@ -46,7 +46,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.9-dev
+VERSION=1.3.10-dev
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)



More information about the tor-commits mailing list