[torbrowser/maint-2.3] update the alpha versions makefile with Sebastian's stable TBB changes - tor-commits

13 Jul 2012

commit 48d75ebe651ec64c14458ac121c8e047a230f86c
Author: Erinn Clark erinn@torproject.org
Date:   Fri Jul 13 13:49:55 2012 +0200
update the alpha versions makefile with Sebastian's stable TBB changes
---
 build-scripts/versions-alpha.mk |  274 ++++++++++++++++++++++++++++-----------
 1 files changed, 198 insertions(+), 76 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index dc9ac0f..fe0810d 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -1,30 +1,27 @@
 #!/usr/bin/make
-RELEASE_VER=2.3.12-alpha
-
-HTTPSEVERY_VER=3.0development.1
-FIREFOX_VER=11.0
-LIBEVENT_VER=2.0.17-stable
-LIBPNG_VER=1.5.7
-NOSCRIPT_VER=2.3.4
-OPENSSL_VER=1.0.1-beta1
-OTR_VER=3.2.0
+RELEASE_VER=2.3.17-alpha
+
+ZLIB_VER=1.2.7
+OPENSSL_VER=1.0.1c
+LIBPNG_VER=1.5.11
+QT_VER=4.8.1
+VIDALIA_VER=0.2.20
+LIBEVENT_VER=2.0.19-stable
+TOR_VER=0.2.3.19-rc
 PIDGIN_VER=2.6.4
-QT_VER=4.7.4
-TOR_VER=0.2.3.12-alpha
-TORBUTTON_VER=1.4.5.1
-VIDALIA_VER=0.3.1
-ZLIB_VER=1.2.6
+FIREFOX_VER=13.0.1
+MOZBUILD_VER=1.5.1
+PYMAKE_VER=87d436cd8974
+TORBUTTON_VER=1.4.6
+NOSCRIPT_VER=2.4.6
+HTTPSEVERYWHERE_VER=3.0development.4
+OBFSPROXY_VER=0.1.4
+OTR_VER=3.2.0
## Extension IDs
 FF_VENDOR_ID:={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-## Extensions
-TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi
-NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi
-BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-la...
-HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
-
 ## File names for the source packages
 ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz
 OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz
@@ -35,93 +32,218 @@ 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).source.tar.bz2
+MOZBUILD_PACKAGE=MozillaBuildSetup-$(MOZBUILD_VER).exe
+PYMAKE_PACKAGE=$(PYMAKE_VER).tar.bz2
+TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi
+NOSCRIPT_PACKAGE=addon-722-latest.xpi
+HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi
+OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz
## Location of files for download
 ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE)
 OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE)
 LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE)
 QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
-VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE)
+VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE)
 LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE)
-TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE)
+TOR_URL=https://archive.torproject.org/tor-package-archive/$(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-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox clone-qtscript clone-vidalia
-fetch-source-osx: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox
-	-mkdir $(FETCH_DIR)
-
-fetch-zlib:
-	-rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE)
+FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/sour...)
+MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_P...)
+PYMAKE_URL=https://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/archive/$(PYMAKE_P...)
+TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PAC...)
+NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
+HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE)
+OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PAC...)
+
+# Provide some mappings between lower and upper case, which means we don't need
+# to rely on shell shenanigans when we need the upper case version. This is
+# necessary because our targets are lowercase, and our variables uppercase.
+zlib=ZLIB
+libpng=LIBPNG
+qt=QT
+openssl=OPENSSL
+vidalia=VIDALIA
+libevent=LIBEVENT
+tor=TOR
+firefox=FIREFOX
+pidgin=PIDGIN
+mozbuild=MOZBUILD
+pymake=PYMAKE
+obfsproxy=OBFSPROXY
+
+# The locations of the unpacked tarballs
+ZLIB_DIR=$(BUILD_DIR)/zlib-$(ZLIB_VER)
+LIBPNG_DIR=$(BUILD_DIR)/libpng-$(LIBPNG_VER)
+QT_DIR=$(BUILD_DIR)/qt-$(QT_VER)
+OPENSSL_DIR=$(BUILD_DIR)/openssl-$(OPENSSL_VER)
+VIDALIA_DIR=$(BUILD_DIR)/vidalia-$(VIDALIA_VER)
+LIBEVENT_DIR=$(BUILD_DIR)/libevent-$(LIBEVENT_VER)
+TOR_DIR=$(BUILD_DIR)/tor-$(TOR_VER)
+FIREFOX_DIR=$(BUILD_DIR)/firefox-$(FIREFOX_VER)
+MOZBUILD_DIR=$(BUILD_DIR)/mozilla-build
+PYMAKE_DIR=$(BUILD_DIR)/pymake-$(PYMAKE_VER)
+OBFSPROXY_DIR=$(BUILD_DIR)/obfsproxy-$(OBFSPROXY_VER)
+
+# Empty targets are written in arch-dependent $(BUILD_DIR). Usual
+# VPATH issues documented below should be avoided as the paths of
+# these targes are never used in dependents recipes. We only make use
+# of targets existence.
+#
+#   http://mad-scientist.net/make/vpath.html
+#
+STAMP_DIR=$(FETCH_DIR)
+vpath build-% $(STAMP_DIR)
+vpath patch-% $(STAMP_DIR)
+vpath %.stamp $(STAMP_DIR)
+
+fetch-source: $(FETCH_DIR)/$(ZLIB_PACKAGE) $(FETCH_DIR)/$(LIBPNG_PACKAGE) $(FETCH_DIR)/$(QT_PACKAGE) $(FETCH_DIR)/$(OPENSSL_PACKAGE) $(FETCH_DIR)/$(VIDALIA_PACKAGE) $(FETCH_DIR)/$(LIBEVENT_PACKAGE) $(FETCH_DIR)/$(TOR_PACKAGE) $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(FETCH_DIR) ;
+
+source-dance: fetch-source unpack-source ;
+
+$(FETCH_DIR):
+	mkdir -p $(FETCH_DIR)
+
+$(BUILD_DIR):
+	mkdir -p $(BUILD_DIR)
+
+# XXX
+# If we can, we should definitely add some stuff here to check signatures -
+# at least for those packages that support it.
+
+$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
-fetch-libpng:
-	-rm -f $(FETCH_DIR)/$(LIBPNG_PACKAGE)
+$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL)
-fetch-qt:
-	-rm -f $(FETCH_DIR)/$(QT_PACKAGE)
+$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL)
-fetch-openssl:
-	-rm -f $(FETCH_DIR)/$(OPENSSL_PACKAGE)
+$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)
-fetch-vidalia:
-	-rm -f $(FETCH_DIR)/$(VIDALIA_PACKAGE)
+$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL)
-fetch-libevent:
-	-rm -f $(FETCH_DIR)/$(LIBEVENT_PACKAGE)
+$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL)
-fetch-tor:
-	-rm -f $(FETCH_DIR)/$(TOR_PACKAGE)
+$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL)
-fetch-firefox:
-	-rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE)
+$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR)
    $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
-clone-qtscript:
-	git clone git://gitorious.org/qt-labs/qtscriptgenerator.git $(FETCH_DIR)/qtscriptgenerator
+$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR)
+	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL)
+
+$(FETCH_DIR)/$(PYMAKE_PACKAGE): | $(FETCH_DIR)
+	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(PYMAKE_URL)
+
+torbutton.xpi:
+	$(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL)
+
+noscript.xpi:
+	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL)
+
+httpseverywhere.xpi:
+	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL)
+
+## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE
+langpack_%.xpi:
+	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+
+## English comes as default, so nothing to do here for the language packe
+langpack_en-US.xpi:
+	touch $@
+
+$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR)
+	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL)
+
+unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR)
+
+
+$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(ZLIB_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -C $(BUILD_DIR)/
+
+$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE)
+	rm -rf $(LIBPNG_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -C $(BUILD_DIR)/
+
+$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)
+	cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/
+	mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR)
+
+$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR)
+	rm -rf $(OPENSSL_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/
+	cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR)
+	cp patch-any-src.sh $(OPENSSL_DIR)
+	cd $(OPENSSL_DIR) && ./patch-any-src.sh
+
+$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(VIDALIA_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -C $(BUILD_DIR)/
+
+$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(LIBEVENT_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -C $(BUILD_DIR)/
+
+$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(TOR_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) -C $(BUILD_DIR)/
+
+$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/alpha/* | $(BUILD_DIR)
+	rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release
+	cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) -C $(BUILD_DIR)/
+	mv $(BUILD_DIR)/mozilla-release $(FIREFOX_DIR)
+	cp ../src/current-patches/firefox/alpha/* $(FIREFOX_DIR)
+	cp patch-any-src.sh $(FIREFOX_DIR)
+	cd $(FIREFOX_DIR) && ./patch-any-src.sh
+
+$(MOZBUILD_DIR): $(FETCH_DIR)/$(MOZBUILD_PACKAGE) ../src/current-patches/mozilla-build/start-msvc.patch ../src/current-patches/mozilla-build/guess-msvc-x64.bat patch-mozilla-build.sh | $(BUILD_DIR)
+	rm -rf $(MOZBUILD_DIR) /c/mozilla-build
+	cmd.exe //c "$(PWD)/install-mozbuild.bat" "$(abspath $(FETCH_DIR)/$(MOZBUILD_PACKAGE))" "$(abspath $(MOZBUILD_DIR))"
+# We have to patch mozillabuild
+	cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZBUILD_DIR)
+	cp ../src/current-patches/mozilla-build/guess-msvc-x64.bat $(MOZBUILD_DIR)
+	cp patch-mozilla-build.sh $(MOZBUILD_DIR)
+	cd $(MOZBUILD_DIR) && ./patch-mozilla-build.sh $(MSVC_VER)
+
+$(PYMAKE_DIR): $(FETCH_DIR)/$(PYMAKE_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(PYMAKE_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(PYMAKE_PACKAGE) -C $(BUILD_DIR)/
+
+$(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR)
+	rm -rf $(OBFSPROXY_DIR)
+	cd $(FETCH_DIR) && tar -xmf $(OBFSPROXY_PACKAGE) -C $(BUILD_DIR)/
-clone-vidalia:
-	-rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-	git clone https://git.torproject.org/vidalia.git $(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-	cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git fetch origin
-	cd $(FETCH_DIR)/vidalia-$(VIDALIA_VER) && git checkout alpha
-clone-vidalia-plugins:
-	-rm -rf $(FETCH_DIR)/vidalia-plugins
-	git clone https://git.torproject.org/vidalia-plugins.git $(FETCH_DIR)/vidalia-plugins
+# Common build functionality. Modified by variables set in OS-specific makefiles
+build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
+	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log
+	cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log
+	cd $(TOR_DIR) && make install
+	touch $(STAMP_DIR)/build-tor
-unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox
+clean-fetch-%:
+	rm -rf $(FETCH_DIR)/$($($*)_PACKAGE)
-unpack-zlib:
-	-rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER)
-	cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE)
+clean-fetch: clean-fetch-zlib clean-fetch-libpng clean-fetch-qt clean-fetch-openssl clean-fetch-vidalia clean-fetch-libevent clean-fetch-tor clean-fetch-firefox clean-fetch-obfsproxy
-unpack-libpng:
-	-rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER)
-	cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE)
+clean-unpack-%:
+	rm -rf $($($*)_DIR)
-unpack-openssl:
-	-rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER)
-	cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)
+clean-unpack: clean-unpack-zlib clean-unpack-libpng clean-unpack-qt clean-unpack-openssl clean-unpack-vidalia clean-unpack-libevent clean-unpack-tor clean-unpack-firefox clean-unpack-obfsproxy
-unpack-vidalia:
-	-rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER)
-	cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE)
+clean-build-%:
+	rm -rf $($($*)_DIR)
+	rm -rf build-$*
-unpack-libevent:
-	-rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER)
-	cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE)
+clean-build: clean-build-zlib clean-build-libpng clean-build-qt clean-build-openssl clean-build-vidalia clean-build-libevent clean-build-tor clean-build-firefox clean-build-obfsproxy
-unpack-tor:
-	-rm -rf $(FETCH_DIR)/tor-$(TOR-VER)
-	cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE)
+.PHONY: clean-fetch clean-unpack clean-build
-unpack-firefox:
-	-rm -rf $(FETCH_DIR)/mozilla-release
-	cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE)

    