March 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Remove betterprivacy
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 124f2c888d11c5c0ff5a1aed6a65418ab671b467 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 05:58:10 2012 +0100 Remove betterprivacy It was unused and probably won't be back --- build-scripts/linux.mk | 10 ---------- build-scripts/osx.mk | 11 +---------- build-scripts/versions.mk | 1 - build-scripts/windows.mk | 9 --------- 4 files changed, 1 insertions(+), 30 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5e3d045..1c785d5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -378,10 +378,6 @@ torbutton.xpi: noscript.xpi: $(WGET) -O $@ $(NOSCRIPT) -## BetterPrivacy -betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) - ## HTTPS Everywhere httpseverywhere.xpi: $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) @@ -436,12 +432,6 @@ install-extensions: $(DEFAULT_EXTENSIONS) (cd $(BUNDLE)/Data/profile/extensions/$$ext_id/ && unzip *.zip && rm *.zip); \ done -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/ && unzip *.zip && rm *.zip); - - ## Language extensions need to be handled differently from other extensions fix-install-rdf: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9268112..edd3b7b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -337,10 +337,6 @@ strip-it-stripper: torbutton.xpi: $(WGET) --no-check-certificate -O $@ $(TORBUTTON) -## BetterPrivacy -betterprivacy.xpi: - $(WGET) --no-check-certificate -O $@ $(BETTERPRIVACY) - ## NoScript development version noscript.xpi: $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) @@ -413,16 +409,11 @@ ifneq ($(LANGCODE), en-US) cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi endif -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && unzip *.zip && rm *.zip) - install-httpseverywhere: httpseverywhere.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org cp httpseverywhere.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org && unzip *.zip && rm *.zip) - + install-noscript: noscript.xpi mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\} cp noscript.xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/\{73a6fe31-595d-460b-a920-fcc0f8843232\}/noscript.zip diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 56f96e6..910d25a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -22,7 +22,6 @@ FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} ## Extensions TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_V… NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-… -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## File names for the source packages diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 55e3c2d..6c09ec8 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -363,10 +363,6 @@ torbutton.xpi: langpack_en-US.xpi: touch $@ -## BetterPrivacy -betterprivacy.xpi: - $(PYGET) -O $@ $(BETTERPRIVACY) - ## NoScript development version noscript.xpi: $(PYGET) -O $@ $(NOSCRIPT) @@ -440,11 +436,6 @@ install-httpseverywhere: httpseverywhere.xpi cp httpseverywhere.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org/httpseverywhere.zip (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org && $(SEVENZIP) x *.zip && rm *.zip) -install-betterprivacy: betterprivacy.xpi - mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} - cp betterprivacy.xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\}/betterprivacy.zip - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions/\{d40f5e7b-d2cf-4856-b441-cc613eeffbe3\} && $(SEVENZIP) x *.zip && rm *.zip) - install-noscript: 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

1 0

[torbrowser/maint-2.2] OSX: Don't use sudo to install libevent
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 5685f0c236eceb0a22040d3bf510476a0495e7cf Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 3 16:16:03 2012 +0100 OSX: Don't use sudo to install libevent There's no need to do so, and it prevents the other stuff from working without privileges --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a02fc33..81e10f0 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-d build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j2 - cd $(LIBEVENT_DIR) && sudo make install + cd $(LIBEVENT_DIR) && make install TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"

1 0

[torbrowser/maint-2.2] Make TBB work on KDE 4
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit ff3308f592e6656658dbb6b52f7be7bac2a6db94 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 23 05:44:33 2012 +0100 Make TBB work on KDE 4 On KDE 4 desktops, Qt apps try to load the KDE 4 style called Oxygen. This causes a few other Qt shared libs to be loaded, and we don't ship them all, which causes a crash. Tomásfound this cool solution, which means we don't have to ship more libraries than we do now. Basically we tell Vidalia to bypass auto-detecting a style and just pre-pick a sane one. If the user manually overrides this, Vidalia will still crash, but this should work for the vast majority of users for now. Works around bug 5214. --- src/RelativeLink/RelativeLink.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 14f6423..692885c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -193,7 +193,7 @@ if [ "${debug}" ]; then # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ - --datadir Data/Vidalia/ + --datadir Data/Vidalia/ -style Cleanlooks printf "\nVidalia exited with the following return code: $?\n" fi @@ -202,7 +202,7 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. -./App/vidalia --datadir Data/Vidalia/ +./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Vidalia exited abnormally. Exit code: $exitcode"

1 0

[torbrowser/maint-2.2] Provide some lower2upper mappings for package names
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 6c41c96e85bfb72836d782b626dc1b033bc93bbb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 09:06:39 2012 +0100 Provide some lower2upper mappings for package names We need these later, when we are fed lower-case strings and want them to be in upper case for our internal variables --- build-scripts/versions.mk | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d021f5f..8baed26 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -46,6 +46,19 @@ TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… +# 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 + fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR)

1 0

[torbrowser/maint-2.2] Define variables before including versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 08e9eef89e2c7cf788885d177cc0c710d34bd61e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 11:12:24 2012 +0100 Define variables before including versions.mk Otherwise, the FETCH_DIR variable won't be there when targets and prerequisites are defined --- build-scripts/linux.mk | 6 +++--- build-scripts/osx.mk | 5 +++-- build-scripts/windows.mk | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 742bc65..cc19344 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -31,9 +31,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk - ## Architecture ARCH_TYPE=$(shell uname -m) BUILD_NUM=7.2 @@ -49,6 +46,9 @@ FETCH_DIR=/srv/build-trees/build-alpha-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now." diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index e8fe22a..b00b9fc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -31,8 +31,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 @@ -60,6 +58,9 @@ FETCH_DIR=$(PWD)/build-$(ARCH_TYPE) BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbosx-dist +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now." diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8c00ff5..e27dd37 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -29,8 +29,6 @@ ### Configuration ### ##################### -## Include versions -include $(PWD)/versions.mk BUILD_NUM=7.1 PLATFORM=Windows @@ -70,6 +68,9 @@ FETCH_DIR=$(PWD)/build-alpha-windows BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist +## Include versions (must happen after variable definitions above +include $(PWD)/versions.mk + source-dance: fetch-source unpack-source echo "We're ready for building now."

1 0

[torbrowser/maint-2.2] Move duplicated extension fetching code to versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit fdc2c70a056dd96a60077d591d6102a6ee25010c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 16 07:13:28 2012 +0100 Move duplicated extension fetching code to versions.mk --- build-scripts/linux.mk | 24 ------------------------ build-scripts/osx.mk | 24 ------------------------ build-scripts/versions.mk | 20 ++++++++++++++++++++ build-scripts/windows.mk | 24 ------------------------ 4 files changed, 20 insertions(+), 72 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 67db913..742bc65 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -367,30 +367,6 @@ remove-bundle-shared-lib-symlinks: ./remove-shared-lib-symlinks $(LIBSDIR)/libz ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) - -## NoScript development version -noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default -#langpack_en-US.xpi: -# touch $@ - -## ## Customize the bundle ## diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index bda3216..e8fe22a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -330,30 +330,6 @@ strip-it-stripper: strip $(APPDIR)/Vidalia.app/Contents/MacOS/Vidalia ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(WGET) --no-check-certificate -O $@ $(TORBUTTON) - -## NoScript development version -noscript.xpi: - $(WGET) --no-check-certificate -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## English comes as default -#langpack_en-US.xpi: -# touch $@ - -## ## Customize the bundle ## diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 910d25a..d021f5f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -81,6 +81,26 @@ fetch-firefox: -rm -f $(FETCH_DIR)/$(FIREFOX_PACKAGE) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) +## Torbutton development version +torbutton.xpi: + $(WGET) -O $@ $(TORBUTTON) + +## NoScript development version +noscript.xpi: + $(WGET) -O $@ $(NOSCRIPT) + +## HTTPS Everywhere +httpseverywhere.xpi: + $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) + +## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE +langpack_%.xpi: + $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + +## English comes as default, so nothing to do here for the language packe +langpack_en-US.xpi: + touch $@ + unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox unpack-zlib: diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 3250219..8c00ff5 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -352,30 +352,6 @@ launcher: cp ../src/RelativeLink/StartTorBrowserBundle.exe $(DEST)/"Start Tor Browser.exe" ## -## How to create required extensions -## - -## Torbutton development version -torbutton.xpi: - $(PYGET) -O $@ $(TORBUTTON) - -## English comes as default -langpack_en-US.xpi: - touch $@ - -## NoScript development version -noscript.xpi: - $(PYGET) -O $@ $(NOSCRIPT) - -## HTTPS Everywhere -httpseverywhere.xpi: - $(PYGET) -O $@ $(HTTPSEVERYWHERE) - -## Generic language pack rule -langpack_%.xpi: - $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi - -## ## Customize the bundle ##

1 0

[torbrowser/maint-2.2] Update the unpack- targets with correct dependencies
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 48047444750af0cba78c6faab7f26d0c12dd4bde Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 12:19:32 2012 +0100 Update the unpack- targets with correct dependencies We also use tar -m here, to not confuse make about extraction time. --- build-scripts/versions.mk | 53 +++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e4191e9..9bd254d 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -63,7 +63,7 @@ pidgin=PIDGIN # The locations of the unpacked tarballs ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) +QT_DIR=$(FETCH_DIR)/qt-$(QT_VER) OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) @@ -127,33 +127,35 @@ $(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) rm -rf $(ZLIB_DIR) cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) -unpack-libpng: - -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) - cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) +$(LIBPNG_DIR): $(FETCH_DIR)/$(LIBPNG_PACKAGE) + rm -rf $(LIBPNG_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBPNG_PACKAGE) -unpack-qt: - -rm -rf $(FETCH_DIR/qt-$(QT_VER) - cd $(FETCH_DIR) && tar -xvzf $(QT_PACKAGE) -unpack-openssl: - -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) - cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE) +$(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) + rm -rf $(QT_DIR) $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) + mv $(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) -unpack-vidalia: - -rm -rf $(FETCH_DIR)/vidalia-$(VIDALIA_VER) - cd $(FETCH_DIR) && tar -xvzf $(VIDALIA_PACKAGE) +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) + rm -rf $(OPENSSL_DIR) + cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -unpack-libevent: - -rm -rf $(FETCH_DIR)/libevent-$(LIBEVENT_VER) - cd $(FETCH_DIR) && tar -xvzf $(LIBEVENT_PACKAGE) +$(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) + rm -rf $(VIDALIA_DIR) + cd $(FETCH_DIR) && tar -xmf $(VIDALIA_PACKAGE) -unpack-tor: - -rm -rf $(FETCH_DIR)/tor-$(TOR_VER) - cd $(FETCH_DIR) && tar -xvzf $(TOR_PACKAGE) +$(LIBEVENT_DIR): $(FETCH_DIR)/$(LIBEVENT_PACKAGE) + rm -rf $(LIBEVENT_DIR) + cd $(FETCH_DIR) && tar -xmf $(LIBEVENT_PACKAGE) -unpack-firefox: - -rm -rf $(FETCH_DIR)/mozilla-release - cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) +$(TOR_DIR): $(FETCH_DIR)/$(TOR_PACKAGE) + rm -rf $(TOR_DIR) + cd $(FETCH_DIR) && tar -xmf $(TOR_PACKAGE) + +$(FIREFOX_DIR): $(FETCH_DIR)/$(FIREFOX_PACKAGE) ../src/current-patches/firefox/* + rm -rf $(FIREFOX_DIR) $(FETCH_DIR)/mozilla-release + cd $(FETCH_DIR) && tar -xmf $(FIREFOX_PACKAGE) mv $(FETCH_DIR)/mozilla-release $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) @@ -164,4 +166,9 @@ clean-fetch-%: 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 -.PHONY: clean-fetch +clean-unpack-%: + rm -rf $($($*)_DIR) + +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 + +.PHONY: clean-fetch clean-unpack

1 0

[torbrowser/maint-2.2] Move the $package_DIR variables to versions.mk
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit a3864fee852f9d72277d01641b2601ae32872fd7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 17:51:38 2012 +0100 Move the $package_DIR variables to versions.mk On Windows, where we need a special directory structure due to the mozilla-build stuff, we use the REAL_FIREFOX_DIR variable to overwrite what we'd otherwise set in versions.mk --- build-scripts/linux.mk | 8 -------- build-scripts/osx.mk | 8 +------- build-scripts/versions.mk | 12 ++++++++++++ build-scripts/windows.mk | 6 ------ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cc19344..5073b70 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -52,14 +52,12 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) build-zlib: cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) @@ -67,7 +65,6 @@ build-openssl: cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: @@ -75,28 +72,24 @@ build-qt: cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_OPTS=--prefix=$(BUILT_DIR) build-libevent: cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) LIBPNG_OPTS=--prefix=$(BUILT_DIR) build-libpng: cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) cd $(LIBPNG_DIR) && make cd $(LIBPNG_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && ./configure $(TOR_OPTS) @@ -114,7 +107,6 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index b00b9fc..c5cfdfb 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -64,7 +64,6 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" build-zlib: @@ -72,7 +71,6 @@ build-zlib: cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) @@ -88,7 +86,7 @@ endif cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) + QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib @@ -97,7 +95,6 @@ build-qt: cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. build-vidalia: @@ -107,7 +104,6 @@ build-vidalia: && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) @@ -116,7 +112,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) @@ -125,7 +120,6 @@ build-tor: cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install -FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 238a209..e4191e9 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -60,6 +60,17 @@ tor=TOR firefox=FIREFOX pidgin=PIDGIN +# The locations of the unpacked tarballs +ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) +LIBPNG_DIR=$(FETCH_DIR)/libpng-$(LIBPNG_VER) +QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER) +OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) +VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) +LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) +TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) +FIREFOX_DIR=$(FETCH_DIR)/firefox-$(FIREFOX_VER) + + 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) ; $(FETCH_DIR): @@ -143,6 +154,7 @@ unpack-tor: unpack-firefox: -rm -rf $(FETCH_DIR)/mozilla-release cd $(FETCH_DIR) && tar -xvjf $(FIREFOX_PACKAGE) + mv $(FETCH_DIR)/mozilla-release $(FIREFOX_DIR) cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index e27dd37..862cd40 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -55,7 +55,6 @@ WINRAR="/c/Program Files (x86)/WinRAR/WinRAR.exe" CC=gcc MSVC_VER=9 -FIREFOX_DIR=/c/build/mozilla-build/mozilla-release MOZ_BUILD=/c/build/mozilla-build ## Build machine specific settings @@ -74,13 +73,11 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install -OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) @@ -88,14 +85,12 @@ build-openssl: cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install -VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) -LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking @@ -104,7 +99,6 @@ build-libevent: cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install -TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)

1 0

[torbrowser/maint-2.2] Replace fetch-$package targets with $fetchdir/$package
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 98072ba5b4a1c0b20fa36ea8e1719d4c8ed2d9b5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 08:54:23 2012 +0100 Replace fetch-$package targets with $fetchdir/$package This allows us to use the make-provided mechanisms to track whether a new download needs to happen or not, and it also allows us to drop the explicit rm $package because these files cannot exist if the target is executed. Also work on the xpi targets. Idea from pmezard --- build-scripts/versions.mk | 73 +++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 35 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8baed26..238a209 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,7 +2,7 @@ RELEASE_VER=2.2.35 -HTTPSEVERY_VER=1.2.2 +HTTPSEVERYWHERE_VER=1.2.2 FIREFOX_VER=10.0.2 LIBEVENT_VER=2.0.17-stable LIBPNG_VER=1.5.9 @@ -19,11 +19,6 @@ ZLIB_VER=1.2.6 ## 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 -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 @@ -34,6 +29,9 @@ 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 +TORBUTTON_PACKAGE=torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT_PACKAGE=addon-722-latest.xpi +HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -45,6 +43,9 @@ LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… +TORBUTTON_URL=https://www.torproject.org/dist/torbutton/$(TORBUTTON_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE) # 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 @@ -59,66 +60,61 @@ tor=TOR firefox=FIREFOX pidgin=PIDGIN -fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox - -mkdir $(FETCH_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) ; + +$(FETCH_DIR): + mkdir -p $(FETCH_DIR) + +# XXX +# If we can, we should definitely add some stuff here to check signatures - +# at least for those packages that support it. -fetch-zlib: - -rm -f $(FETCH_DIR)/$(ZLIB_PACKAGE) +$(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) -## Torbutton development version torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) + $(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL) -## NoScript development version noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) + $(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL) -## HTTPS Everywhere httpseverywhere.xpi: - $(WGET) -O $@ --no-check-certificate $(HTTPSEVERYWHERE) + $(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL) ## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.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 $@ -unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox +unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) -unpack-zlib: - -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) - cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +$(ZLIB_DIR): $(FETCH_DIR)/$(ZLIB_PACKAGE) + rm -rf $(ZLIB_DIR) + cd $(FETCH_DIR) && tar -xmf $(ZLIB_PACKAGE) unpack-libpng: -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) @@ -150,3 +146,10 @@ unpack-firefox: cp ../src/current-patches/firefox/* $(FIREFOX_DIR) cp patch-any-src.sh $(FIREFOX_DIR) cd $(FIREFOX_DIR) && ./patch-any-src.sh + +clean-fetch-%: + rm -rf $(FETCH_DIR)/$($($*)_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 + +.PHONY: clean-fetch

1 0

[torbrowser/maint-2.2] Add dependencies for all build- targets
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 4078a8417ef7ab8be7a93efd36c69c50dde436e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 1 19:10:00 2012 +0100 Add dependencies for all build- targets --- build-scripts/linux.mk | 34 +++++++++++++++++++++------------- build-scripts/osx.mk | 21 ++++++++++++++------- build-scripts/versions.mk | 9 ++++++++- build-scripts/windows.mk | 19 +++++++++++++------ 4 files changed, 56 insertions(+), 27 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 5073b70..8f25015 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -53,48 +53,55 @@ source-dance: fetch-source unpack-source echo "We're ready for building now." ZLIB_OPTS=--shared --prefix=$(BUILT_DIR) -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install + touch build-zlib + +LIBPNG_OPTS=--prefix=$(BUILT_DIR) +build-libpng: $(LIBPNG_DIR) + cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) + cd $(LIBPNG_DIR) && make + cd $(LIBPNG_DIR) && make install + touch build-libpng OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -I$(BUILT_DIR)/include -L$(BUILT_DIR)/lib -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib -build-qt: +build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install + touch build-qt VIDALIA_OPTS=-DOPENSSL_LIBCRYPTO=$(BUILT_DIR)/lib/libcrypto.so.1.0.0 -DOPENSSL_LIBSSL=$(BUILT_DIR)/lib/libssl.so.1.0.0 -DCMAKE_BUILD_TYPE=debug -DQT_QMAKE_EXECUTABLE=$(BUILT_DIR)/bin/qmake .. -build-vidalia: +build-vidalia: build-openssl build-qt $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) && make -j $(NUM_CORES) cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + touch build-vidalia LIBEVENT_OPTS=--prefix=$(BUILT_DIR) -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install - -LIBPNG_OPTS=--prefix=$(BUILT_DIR) -build-libpng: - cd $(LIBPNG_DIR) && ./configure $(LIBPNG_OPTS) - cd $(LIBPNG_DIR) && make - cd $(LIBPNG_DIR) && make install + touch build-libevent TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor ## Polipo doesn't use autoconf, so we just have to hack their Makefile ## This probably needs to be updated if Polipo ever updates their Makefile @@ -107,9 +114,10 @@ build-polipo: build-pidgin: echo "We're not building pidgin yet!" -build-firefox: +build-firefox: $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR) cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build + touch build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index c5cfdfb..947c04e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -66,13 +66,14 @@ source-dance: fetch-source unpack-source ZLIB_OPTS=--prefix=$(BUILT_DIR) ZLIB_CFLAGS="-arch $(ARCH_TYPE)" -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && CFLAGS=$(ZLIB_CFLAGS) ./configure $(ZLIB_OPTS) cd $(ZLIB_DIR) && make -j $(NUM_CORES) cd $(ZLIB_DIR) && make install + touch build-zlib OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) cp patch-any-src.sh $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./patch-any-src.sh @@ -85,44 +86,50 @@ endif # Do not use -j for the following make call, random build errors might happen. cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ -fast -release -no-framework -nomake demos -nomake examples $(SDK) QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib -build-qt: +build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS) cd $(QT_DIR) && make -j $(NUM_CORES) cd $(QT_DIR) && make install + touch build-qt VIDALIA_OPTS=-DCMAKE_OSX_ARCHITECTURES=$(ARCH_TYPE) -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DCMAKE_BUILD_TYPE=debug .. -build-vidalia: +build-vidalia: build-openssl build-qt $(VIDALIA_DIR) export MACOSX_DEPLOYMENT_TARGET=$(OSX_VERSION) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake $(VIDALIA_OPTS) \ && make -j $(NUM_CORES) && make dist-osx-libraries cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install + touch build-vidalia LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC) -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch build-libevent TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor -build-firefox: +build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && make -f client.mk build + touch build-firefox copy-firefox: -rm -rf $(FETCH_DIR)/Firefox.app diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 9bd254d..da23ea1 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -171,4 +171,11 @@ clean-unpack-%: 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 -.PHONY: clean-fetch clean-unpack +clean-build-%: + rm -rf $($($*)_DIR) + rm -rf build-$* + +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 + +.PHONY: clean-fetch clean-unpack clean-build + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 862cd40..046baa4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -73,40 +73,46 @@ include $(PWD)/versions.mk source-dance: fetch-source unpack-source echo "We're ready for building now." -build-zlib: +build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES) cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install + touch build-zlib OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include -build-openssl: +build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend cd $(OPENSSL_DIR) && make cd $(OPENSSL_DIR) && make install + touch build-openssl VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) -build-vidalia: +# XXX Once we build qt on windows, we'll want to add build-qt here +build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) .. cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES) + touch build-vidalia LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking -build-libevent: +build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) cd $(LIBEVENT_DIR) && make -j $(NUM_CORES) cd $(LIBEVENT_DIR) && make install + touch build-libevent TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor:PATH+=:$(BUILT_DIR)/bin -build-tor: +build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install + touch build-tor patch-mozbuild: cp ../src/current-patches/mozilla-build/start-msvc.patch $(MOZ_BUILD) @@ -114,9 +120,10 @@ patch-mozbuild: cp patch-mozilla-build.sh $(MOZ_BUILD) cd $(MOZ_BUILD) && ./patch-mozilla-build.sh $(MSVC_VER) -build-firefox: +build-firefox: $(FIREFOX_DIR) $(CONFIG_SRC)/dot_mozconfig $(MOZ_BUILD) $(MOZ_BUILD)/start-msvc$(MSVC_VER).bat cp $(CONFIG_SRC)/dot_mozconfig $(FIREFOX_DIR)/mozconfig cd $(MOZ_BUILD) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR)" + touch build-firefox copy-firefox: -rm -rf $(FIREFOX)

1 0