[tor-commits] [torbrowser/master] give windows and linux the ability to write their tbb version into prefs.js too

[erinn at torproject.org]

commit 703a9aa38e53d4d043fe9c8d6c4566eca2ee8693
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 28 19:24:58 2011 +0100

    give windows and linux the ability to write their tbb version into prefs.js too
---
 build-scripts/linux.mk   |    6 +++++-
 build-scripts/windows.mk |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 659e3b0..85f8830 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -392,7 +392,8 @@ compressed-bundle_%:
 	LANGCODE=$* make -f linux.mk compressed-bundle-localized
 
 bundle-localized_%.stamp:
-	make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref
+	make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \
+	patch-pidgin-language update-extension-pref write-tbb-version
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
@@ -466,3 +467,6 @@ update-extension-pref:
 	ext_ver=$$(sed -n '/em:version/{s,.*="\(.*\)".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)@firefox.mozilla.org/install.rdf); \
 	sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js
 
+write-tbb-version:
+	printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 294b2c6..2016242 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -360,7 +360,8 @@ split-bundle_%:
 	LANGCODE=$* make -f windows.mk split-bundle-localized
 
 bundle-localized_%.stamp:
-	make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language
+	make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \
+	patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version
 	touch bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
@@ -439,6 +440,9 @@ patch-firefox-language:
 apply-prefs:
 	cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC)
 
+write-tbb-version:
+	printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js
+
 ## Export the source code of the bundle
 SRCNAME=$(COMPRESSED_NAME)
 SRCDEST=/tmp