commit d91ba82da4a8a6b915910a46a7b8465a556cfe1a Author: Erinn Clark erinn@torproject.org Date: Sat Jul 9 02:17:38 2011 -0300

update firefox build targets --- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1fa698f..5f00421 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -101,9 +101,9 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install

-FIREFOX_DIR=$(FETCH_DIR)/mozilla-2.0 +FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*firefox* $(FIREFOX_DIR) + cp ../src/current-patches/*Firefox5* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a1274af..ae94848 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -28,7 +28,7 @@ VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 -FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 +FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2

## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -38,7 +38,7 @@ 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) -#FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/...) +FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/...)

fetch-source: -mkdir $(FETCH_DIR) @@ -48,6 +48,10 @@ fetch-source: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL)

+fetch-firefox: + -rm -rf $(FETCH_DIR)/mozilla-release + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) + unpack-source: cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)