commit c39850cb56a5a0301195a9a30fd032654c2243a8 Author: Erinn Clark erinn@torproject.org Date: Fri Jan 25 16:28:05 2013 +0100

add pdfjs to windows bundles and update the way torbutton is handled --- build-scripts/windows-alpha.mk | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 8f6391d..40222ca 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -367,7 +367,7 @@ compressed-bundle_%: LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized

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

@@ -395,9 +395,8 @@ endif rm -fr $(DUMMYPROFILE)

install-torbutton: $(SEVENZIP) torbutton.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} - cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}/torbutton.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} && $(SEVENZIP) x *.zip && rm *.zip) + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/ + cp torbutton.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/torbutton@torproject.org.xpi

install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere@eff.org @@ -409,6 +408,9 @@ install-noscript: $(SEVENZIP) noscript.xpi cp noscript.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/noscript.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232} && $(SEVENZIP) x *.zip && rm *.zip)

+install-pdfjs: pdfjs.xpi + mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/ + cp pdfjs.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/uriloader@pdf.js.xpi

## Set the language for Vidalia patch-vidalia-language: