[tor-commits] [torbrowser/maint-2.2] Move dependencies to mozbuild so we don't have to download them ourselves.

[erinn at torproject.org]

commit d9acd18d1d5903b495287f886256bf827094fcc5
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Thu May 3 21:25:23 2012 +0200

    Move dependencies to mozbuild so we don't have to download them ourselves.
---
 build-scripts/windows.mk |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 213d3e5..e3afbc0 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -20,7 +20,7 @@ PLATFORM=Windows
 MING=/mingw/bin
 QT_LIB=/c/Qt/$(QT_VER)/bin
 OPENSSL_LIB=$(COMPILED_BINS)
-WIX_LIB="/c/Program Files (x86)/Windows Installer XML v3.5/bin"
+WIX_LIB="$(MOZBUILD_DIR)/wix-351728"
 
 ## Location of bundle components
 VIDALIA=$(BUILD_DIR)/vidalia-$(VIDALIA_VER)
@@ -32,10 +32,9 @@ PIDGIN=$(BUILD_DIR)/PidginPortable-$(PIDGIN_VER)
 PWD:=$(shell pwd)
 PYTHON=$(MOZBUILD_DIR)/python/python.exe
 PYMAKE=$(PYMAKE_DIR)/make.py
-SEVENZIP="/c/Program Files/7-Zip/7z.exe"
+SEVENZIP="$(MOZBUILD_DIR)/7zip/7z.exe"
 WGET=wget
 VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py
-WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe"
 CC=gcc
 
 MSVC_VER=9
@@ -81,7 +80,7 @@ build-qt: build-zlib build-openssl $(QT_DIR)
 VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=$(QT_LIB)/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DWIX_BINARY_DIR=$(WIX_LIB)
 # XXX Once we build qt on windows, we'll want to add build-qt here
 build-vidalia: PATH+=:$(QT_LIB)
-build-vidalia: $(VIDALIA_DIR)
+build-vidalia: $(VIDALIA_DIR) $(WIX_LIB)
 	-mkdir $(VIDALIA_DIR)/build
 	cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..
 	cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES)
@@ -332,7 +331,7 @@ bundle-localized_%.stamp:
 
 bundle-localized: bundle-localized_$(LANGCODE).stamp
 
-compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp
+compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp
 	rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe
 	cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)
 
@@ -353,17 +352,17 @@ ifneq ($(LANGCODE), en-US)
 endif
 	rm -fr $(DUMMYPROFILE)
 
-install-torbutton: torbutton.xpi
+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)
 
-install-httpseverywhere: httpseverywhere.xpi
+install-httpseverywhere: $(SEVENZIP) httpseverywhere.xpi
 	mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere at eff.org
 	cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere at eff.org/httpseverywhere.zip
 	(cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere at eff.org && $(SEVENZIP) x *.zip && rm *.zip)
 
-install-noscript: noscript.xpi
+install-noscript: $(SEVENZIP) noscript.xpi
 	mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}
 	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)
@@ -419,3 +418,5 @@ srcdist:
 	cd .. && git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz
 
 $(PYTHON): | $(MOZBUILD_DIR) ;
+$(SEVENZIP): | $(MOZBUILD_DIR) ;
+$(WIX_LIB): | $(MOZBUILD_DIR) ;