[torbrowser/master] bump build versions to 4 and torbutton to 1.4.3 - tor-commits

23 Oct 2011

commit 69e5c54bc487f16fcfc2625769bc0fd4b185f654
Author: Erinn Clark erinn@torproject.org
Date:   Sat Sep 10 02:27:03 2011 +0100
bump build versions to 4 and torbutton to 1.4.3
---
 README.LINUX-2.2          |    2 +-
 README.OSX-2.2            |    2 +-
 README.WIN-2.2            |    2 +-
 build-scripts/linux.mk    |    5 ++++-
 build-scripts/osx.mk      |    7 +++++--
 build-scripts/versions.mk |    2 +-
 build-scripts/windows.mk  |    5 ++++-
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.LINUX-2.2 b/README.LINUX-2.2
index b1f441c..2f23ecf 100644
--- a/README.LINUX-2.2
+++ b/README.LINUX-2.2
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.14 (with Qt 4.6.2)
 Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
 Firefox (Aurora) 6.0.2
- _ Torbutton 1.4.2
+ _ Torbutton 1.4.3
  |_ NoScript 2.1.2.7
  |_ HTTPS-Everywhere 1.0.0development.5
diff --git a/README.OSX-2.2 b/README.OSX-2.2
index 5358d96..0f63125 100644
--- a/README.OSX-2.2
+++ b/README.OSX-2.2
@@ -7,7 +7,7 @@ Included applications
 Vidalia 0.2.14 (with Qt 4.6.2)
 Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
 Firefox (Aurora) 6.0.2
- _ Torbutton 1.4.2
+ _ Torbutton 1.4.3
  |_ NoScript 2.1.2.7
  |_ HTTPS-Everywhere 1.0.0development.5
diff --git a/README.WIN-2.2 b/README.WIN-2.2
index e054a10..90f8fc7 100644
--- a/README.WIN-2.2
+++ b/README.WIN-2.2
@@ -8,7 +8,7 @@ Vidalia 0.2.14 (with Qt 4.6.2)
 Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d)
 FirefoxPortable 6.0.2
  _ Firefox (Aurora) 6.0.2
-    _ Torbutton 1.4.2
+    _ Torbutton 1.4.3
     |_ NoScript 2.1.2.7
     |_ HTTPS-Everywhere 1.0.0development.5
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 47fd74b..089218f 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=Linux
## Location of directory for source unpacking
@@ -489,6 +489,9 @@ update-extension-pref:
    sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js
    sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
+print-version:
+	@echo $(RELEASE_VER)-$(BUILD_NUM)
+
 write-tbb-version:
    printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js
    printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 7d03546..d19576e 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -36,7 +36,7 @@ include $(PWD)/versions.mk
## Architecture
 ARCH_TYPE=i386
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=MacOS
## Location of directory for source unpacking
@@ -396,7 +396,7 @@ ifneq ($(LANGCODE), en-US)
    (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip  -r ../langpack_$(LANGCODE).xpi .)
 endif
-install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf
+install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi)
 ifneq ($(LANGCODE), en-US)
    mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/
    cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org.xpi
@@ -443,6 +443,9 @@ update-extension-pref:
    sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
    sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js
+print-version:
+	@echo $(RELEASE_VER)-$(BUILD_NUM)
+
 write-tbb-version:
    printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 65d9abc..44a79a4 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4
 POLIPO_VER=1.0.4.1
 QT_VER=4.6.2
 TOR_VER=0.2.2.32
-TORBUTTON_VER=1.4.2
+TORBUTTON_VER=1.4.3
 VIDALIA_VER=0.2.14
 ZLIB_VER=1.4.0
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index de36634..8014ac4 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -31,7 +31,7 @@
## Include versions
 include $(PWD)/versions.mk
-BUILD_NUM=3
+BUILD_NUM=4
 PLATFORM=Windows
## Location of required libraries
@@ -469,6 +469,9 @@ patch-firefox-language:
 apply-prefs:
    cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC)
+print-version:
+	@echo $(RELEASE_VER)-$(BUILD_NUM)
+
 write-tbb-version:
    printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js
    printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js

    