[or-cvs] r22587: {torbrowser} let's release a tor browser bundle today. (in torbrowser/trunk: . build-scripts)

[Andrew Lewman]

Author: phobos
Date: 2010-07-04 17:28:23 +0000 (Sun, 04 Jul 2010)
New Revision: 22587

Modified:
   torbrowser/trunk/README
   torbrowser/trunk/build-scripts/INSTALL
   torbrowser/trunk/build-scripts/Makefile
Log:
let's release a tor browser bundle today.


Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README	2010-07-04 03:57:25 UTC (rev 22586)
+++ torbrowser/trunk/README	2010-07-04 17:28:23 UTC (rev 22587)
@@ -267,6 +267,6 @@
 1.3.6: Released 2010-05-26
   update Vidalia to 0.2.9
 
-1.3.7: Released
+1.3.7: Released 2010-07-04
   update Pidgin to 2.7.1r2
   update Firefox to 3.5.10

Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL	2010-07-04 03:57:25 UTC (rev 22586)
+++ torbrowser/trunk/build-scripts/INSTALL	2010-07-04 17:28:23 UTC (rev 22587)
@@ -398,11 +398,11 @@
 
 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
+        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.25.tar.gz
-        $ cd tor-0.2.1.25/
+        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
 
@@ -414,26 +414,26 @@
 
 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
+    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.7.tar.gz
-    mv vidalia-0.2.7/ 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.6/bin/
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.8/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/
+    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!
 
@@ -531,7 +531,7 @@
 
 Download FirefoxPortable:
 
-    http://prdownloads.sourceforge.net/portableapps/FirefoxPortable_3.5.9_English.paf.exe
+    http://prdownloads.sourceforge.net/portableapps/FirefoxPortable_3.5.10_English.paf.exe
 
 Run the installer and select it into: 'C:\build\FirefoxPortable-<version>'
 
@@ -612,8 +612,8 @@
 
 And then change the Tor version:
 
-        From: TOR=/c/build/tor-0.2.1.25
-        To: TOR=/c/build/tor-0.2.1.25
+        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".
 
@@ -632,12 +632,13 @@
  - 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/2.0.0.18/win32/xpi
+    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.

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2010-07-04 03:57:25 UTC (rev 22586)
+++ torbrowser/trunk/build-scripts/Makefile	2010-07-04 17:28:23 UTC (rev 22587)
@@ -25,8 +25,8 @@
 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)
+FIREFOX_SRC=/c/build/FirefoxPortable
+PIDGIN_SRC=/c/build/PidginPortable
 
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
@@ -46,7 +46,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.3.7-dev
+VERSION=1.3.7
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -88,8 +88,8 @@
 bundle: bundle_en-US
 
 all-bundles-both:
-	USE_PIDGIN=1 make all-bundles
-	make clean
+#	USE_PIDGIN=1 make all-bundles
+#	make clean
 	USE_PIDGIN=0 make all-bundles
 	make clean
 
@@ -308,7 +308,7 @@
 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
+                                   $(BUNDLE)/PidginPortable/App/Pidgin/Gtk/share/locale
 endif
 
 patch-firefox-language: