commit a5f7328004ffef76cb954719f0f3749dc8e3b45f Author: Erinn Clark erinn@torproject.org Date: Sat Aug 20 21:35:01 2011 +0200

update lots and lots of build targets for building firefox, fixing tabs, and making it easier to download & unpack all of the tarballs --- build-scripts/config/dot_mozconfig | 3 --- build-scripts/linux.mk | 24 ++++++++++++++++++------ build-scripts/osx.mk | 4 ++++ build-scripts/versions.mk | 35 +++++++++++++++++++++++++++++++---- build-scripts/windows.mk | 2 +- 5 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 7ba5ca6..934e4f4 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -3,9 +3,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser

-ac_add_options --enable-static -ac_add_options --disable-shared -ac_add_options --disable-libxul ac_add_options --enable-optimize ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index aaeb11d..1a70edb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -108,8 +108,20 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!"

+FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - # XXX: add directions ASAP + cp ../src/current-patches/*Firefox* $(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 + cd $(FIREFOX_DIR) && make -f client.mk build + +copy-firefox: + -rm -rf $(FETCH_DIR)/Firefox + ## This is so ugly. Update it to use cool tar --transform soon. + cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-pc-linux-gnu/ package + cp $(FIREFOX_DIR)/obj-$(ARCH_TYPE)-pc-linux-gnu/*bz2 $(FETCH_DIR) + cd $(FETCH_DIR) && tar -xvjf firefox-$(FIREFOX_VER).en-US.bz2 && mv firefox Firefox

# source-dance unpack-source build-all-binaries: source-dance build-zlib build-openssl build-libpng build-qt build-vidalia build-libevent build-tor build-polipo @@ -269,9 +281,9 @@ install-binaries: cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ - $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) # OpenSSL @@ -436,8 +448,8 @@ patch-pidgin-language: ## Patch Pidgin ifeq ($(USE_PIDGIN),1) ./patch-pidgin-language.sh $(BUNDLE)/PidginPortable/Data/settings/PidginPortableSettings.ini $(LANGCODE) \ - $(BUNDLE)/PidginPortable/App/Pidgin/locale \ - $(BUNDLE)/PidginPortable/App/GTK/share/locale + $(BUNDLE)/PidginPortable/App/Pidgin/locale \ + $(BUNDLE)/PidginPortable/App/GTK/share/locale endif

patch-firefox-language: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7151ddf..1ab3a77 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -109,6 +109,10 @@ build-firefox: cd $(FIREFOX_DIR) && ./patch-firefox-src.sh cd $(FIREFOX_DIR) && make -f client.mk build

+copy-firefox: + -rm -rf $(FETCH_DIR)/Firefox.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(FETCH_DIR)/Firefox.app + build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor echo "If we're here, we've done something right."

diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e116326..e8991a2 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -35,28 +35,55 @@ 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/dist/vidalia/$(VIDALIA_PACKAGE) -LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) +LIBEVENT_URL=http://archive.torproject.org/tor-package-archive/libevent/$(LIBEVENT_PACKAG...) 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)/...)

-fetch-source: +fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR) + +fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) + +fetch-openssl: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL) + +fetch-vidalia: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL) + +fetch-libevent: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) + +fetch-tor: $(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: +unpack-source: unpack-zlib unpack-openssl unpack-vidalia unpack-libevent unpack-tor unpack-firefox + +unpack-zlib: + -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) + +unpack-openssl: + -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) + +unpack-vidalia: + -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) + +unpack-libevent: + -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE)

+unpack-tor: + -rm -rf $(FETCH_DIR)/tor-$(TOR-VER) + cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE)

+unpack-firefox: + -rm -rf $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1836741..da5dda1 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -359,7 +359,7 @@ split-bundle_%: LANGCODE=$* make -f windows.mk split-bundle-localized

bundle-localized_%.stamp: - make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-betterprivacy install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language touch bundle-localized_$*.stamp

bundle-localized: bundle-localized_$(LANGCODE).stamp