commit d7fe97d1a9943024caf7c10a55147c4bca8f0cc2 Author: Erinn Clark erinn@torproject.org Date: Fri Apr 22 13:33:29 2011 +0000

update some versions and programs for windows tbb with firefox 4 --- build-scripts/versions.mk | 13 +++++++------ build-scripts/windows.mk | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 016df29..8eab139 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -8,6 +8,7 @@ NOSCRIPT_VER=2.1.0.1 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 +POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.24-alpha TORBUTTON_VER=1.3.2-alpha @@ -31,7 +32,7 @@ FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) -VIDALIA_URL=http://www.torproject.org/vidalia/dist/$(VIDALIA_PACKAGE) +VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE) @@ -39,11 +40,11 @@ PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)

fetch-source: -mkdir $(FETCH_DIR) - $(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) - $(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL)

unpack-source: cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 2ccef20..533d1ee 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -33,10 +33,10 @@ include $(PWD)/versions.mk

## Location of required libraries -MING=/c/c/mingw/bin -QT=/c/Qt/$(QT_VER)/bin -OPENSSL=/e/build/openssl-$(OPENSSL_VER) -WIX=/c/Program Files/WiX/bin +MING=/c/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"

## Location of bundle components VIDALIA=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) @@ -47,7 +47,7 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER)

## Location of utility applications PWD:=$(shell pwd) -PYTHON=/c/Python25/python.exe +PYTHON=/c/Python26/python.exe SEVENZIP="/c/Program Files/7-Zip/7z.exe" WGET=$(PYTHON) $(PWD)/pyget.py VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py