[tor-commits] [torbrowser/maint-2.4] add Mozilla's in-browser PDF reader extension to alpha packages

[erinn at torproject.org]

commit b569b700dc41e6b3245b9c8c4f08d5addbb38557
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Jan 17 11:01:54 2013 +0100

    add Mozilla's in-browser PDF reader extension to alpha packages
---
 build-scripts/osx-alpha.mk      |    5 ++++-
 build-scripts/versions-alpha.mk |    8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 3c1e050..f007285 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -370,7 +370,7 @@ bundle_%:
 compressed-bundle_%:
 	LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized
 bundle-localized_%.stamp:
-	make -f osx-alpha.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final
+	make -f osx-alpha.mk copy-files_$* install-torbutton install-httpseverywhere install-noscript install-pdfjs install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final
 	touch $(STAMP_DIR)/bundle-localized_$*.stamp
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
@@ -424,6 +424,9 @@ install-noscript: noscript.xpi
 	cp noscript.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip
 	(cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} && unzip *.zip && rm *.zip)
 
+install-pdfjs: pdfjs.xpi
+	cp pdfjs.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/uriloader at pdf.js.xpi
+
 ## Set the language for Vidalia
 patch-vidalia-language:
 	## Patch Vidalia
diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 87e3695..f7c887d 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -37,6 +37,7 @@ PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2
 TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi
 NOSCRIPT_PACKAGE=addon-722-latest.xpi
 HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi
+PDFJS_PACKAGE=addon-352704-latest.xpi
 OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz
 
 ## Location of files for download
@@ -51,9 +52,11 @@ PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)
 FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE)
 MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_PACKAGE)
 PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_PACKAGE)
-TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE)
+#TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PACKAGE)
+TORBUTTON_URL=https://people.torproject.org/~mikeperry/torbutton-$(TORBUTTON_PACKAGE)
 NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
 HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE)
+PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/$(PDFJS_PACKAGE)
 OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PACKAGE)
 
 # Provide some mappings between lower and upper case, which means we don't need
@@ -150,6 +153,9 @@ noscript.xpi:
 httpseverywhere.xpi:
 	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL)
 
+pdfjs.xpi:
+	$(WGET) --no-check-certificate -O $@ $(PDFJS_URL)
+
 ## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE
 langpack_%.xpi:
 	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi