commit fe02f6e09bdc1e5e8f8b4ca92dfda3da2cf9ab8c Author: Erinn Clark erinn@torproject.org Date: Thu Jan 24 10:30:01 2013 +0100

update how torbutton extension is handled in Linux, add pdfjs --- build-scripts/linux-alpha.mk | 7 +++++-- build-scripts/osx-alpha.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3b6864a..1245f42 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -369,7 +369,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized

bundle-localized_%.stamp: - make -f linux-alpha.mk copy-files_$* install-extensions install-torbutton install-lang-extensions patch-vidalia-language patch-firefox-language \ + make -f linux-alpha.mk copy-files_$* install-extensions install-torbutton install-pdfjs install-lang-extensions patch-vidalia-language patch-firefox-language \ patch-pidgin-language update-extension-pref write-tbb-version touch $(STAMP_DIR)/bundle-localized_$*.stamp

@@ -403,7 +403,10 @@ install-extensions: $(DEFAULT_EXTENSIONS)

install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/Data/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + cp torbutton.xpi $(BUNDLE)/Data/profile/extensions/torbutton@torproject.org.xpi + +install-pdfjs: pdfjs.xpi + cp pdfjs.xpi $(BUNDLE)/Data/profile/extensions/uriloader@pdf.js.xpi

## Language extensions need to be handled differently from other extensions install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index f007285..8e339f7 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -412,7 +412,7 @@ endif

install-torbutton: torbutton.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ - cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.xpi + cp torbutton.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/torbutton@torproject.org.xpi

install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere@eff.org