November 2013 - tor-commits - lists.torproject.org

[torbrowser/master] Windows and Linux have been sharing their mozconfigs for too long. Break them out into OS/arch-specific mozconfigs.
by erinn＠torproject.org 11 Nov '13

11 Nov '13

commit 70be56012287bf53920fbd4c0993062b8f6e0c41 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Nov 11 13:20:49 2013 -0200 Windows and Linux have been sharing their mozconfigs for too long. Break them out into OS/arch-specific mozconfigs. --- build-scripts/config/mozconfig-lin-i386 | 16 ++++++++++++++++ build-scripts/config/mozconfig-lin-x86_64 | 16 ++++++++++++++++ build-scripts/config/mozconfig-win | 16 ++++++++++++++++ build-scripts/linux-alpha.mk | 4 ++-- build-scripts/linux.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 7 files changed, 56 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/mozconfig-lin-i386 b/build-scripts/config/mozconfig-lin-i386 new file mode 100755 index 0000000..4421981 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-i386 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-lin-x86_64 b/build-scripts/config/mozconfig-lin-x86_64 new file mode 100755 index 0000000..e71d8d2 --- /dev/null +++ b/build-scripts/config/mozconfig-lin-x86_64 @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-win b/build-scripts/config/mozconfig-win new file mode 100755 index 0000000..e71d8d2 --- /dev/null +++ b/build-scripts/config/mozconfig-win @@ -0,0 +1,16 @@ +. $topsrcdir/browser/config/mozconfig + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 813c228..bb459b6 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -89,8 +89,8 @@ ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && make install endif -build-firefox: config/dot_mozconfig $(FIREFOX_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR) + cp config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a922130..0f62c21 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -82,8 +82,8 @@ TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-lib build-pidgin: echo "We're not building pidgin yet!" -build-firefox: config/dot_mozconfig $(FIREFOX_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR) + cp config/mozconfig-lin-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(FIREFOX_DIR) && make -f client.mk build cd $(FIREFOX_DIR) && make -C obj-$(ARCH_TYPE)-* package INNER_MAKE_PACKAGE=true diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..fb41715 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -110,8 +110,8 @@ ifeq ($(USE_OBFSPROXY),1) cd $(OBFSPROXY_DIR) && make install endif -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-win $(MOZBUILD_DIR) + cp config/mozconfig-win $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" touch $(STAMP_DIR)/build-firefox diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7480a4c..b5b9e50 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -100,8 +100,8 @@ TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --disable-asciidoc build-tor:PATH+=:$(BUILT_DIR)/bin -build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) - cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig +build-firefox: $(FIREFOX_DIR) config/mozconfig-win $(MOZBUILD_DIR) + cp config/mozconfig-win $(FIREFOX_DIR)/mozconfig cp branding/* $(FIREFOX_DIR)/browser/branding/official cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)" touch $(STAMP_DIR)/build-firefox

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 11 Nov '13

11 Nov '13

commit e707045d480f976522e0fad04ae93e63810e2ae6 Merge: 9ce7869 70be560 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Nov 11 13:21:29 2013 -0200 Merge branch 'maint-2.4' build-scripts/config/mozconfig-lin-i386 | 16 ++++++++++++++++ build-scripts/config/mozconfig-lin-x86_64 | 16 ++++++++++++++++ build-scripts/config/mozconfig-win | 16 ++++++++++++++++ build-scripts/linux-alpha.mk | 4 ++-- build-scripts/linux.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 7 files changed, 56 insertions(+), 8 deletions(-)

1 0

[ooni-probe/master] Add coveralls badge
by art＠torproject.org 11 Nov '13

11 Nov '13

commit a9f93b9ea36d81375b48fb7432744031debe09d5 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:17:43 2013 +0100 Add coveralls badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6bfb5e2..09dee0e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Coverage Status](https://coveralls.io/repos/TheTorProject/ooni/badge.png)](https://coveralls.io/r/TheTorProject/ooni) + # ooniprobe - Open Observatory of Network Interference "The Net interprets censorship as damage and routes around it."

1 0

[ooni-probe/master] Add build status to README
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 6f93262d1e6107deb583af40d99b4f9d43225b6b Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:25:43 2013 +0100 Add build status to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 09dee0e..bd29056 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Build Status](https://travis-ci.org/TheTorProject/ooni-probe.png?branch=feature/c… [![Coverage Status](https://coveralls.io/repos/TheTorProject/ooni/badge.png)](https://coveralls.io/r/TheTorProject/ooni) # ooniprobe - Open Observatory of Network Interference

1 0

[ooni-probe/master] Delete symlink to README
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 10a758013c555e9d61ec43d4d34e6f7784bb2775 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:31:15 2013 +0100 Delete symlink to README --- README | 1 - 1 file changed, 1 deletion(-) diff --git a/README b/README deleted file mode 120000 index 42061c0..0000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -README.md \ No newline at end of file

1 0

[ooni-probe/master] Add support for running coveralls after travis CI
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 87877094d029f4007337956750fb046c2d2d3127 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:23:55 2013 +0100 Add support for running coveralls after travis CI --- .coveragerc | 2 ++ .travis.yml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..2f4e3de --- /dev/null +++ b/.coveragerc @@ -0,0 +1,2 @@ +[run] +source = ooni diff --git a/.travis.yml b/.travis.yml index 568f42d..0a7ae5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,11 @@ python: # the first is for testing pip and the second for setuptools install: - pip install pyrex + - pip install coveralls - pip install -r requirements.txt --use-mirrors - python setup.py install # command to run tests, e.g. python setup.py test script: - # To be activated after merge of PR#64 - - trial ooni + - coverage run $(which trial) ooni +after_success: + - coveralls

1 0

[ooni-probe/master] Add blocking tests to setup.py modules.
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 9939fda32d9e2c2992f4153d93017f523790f7ee Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:14:02 2013 +0100 Add blocking tests to setup.py modules. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 978f9b3..8eccd4e 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,7 @@ setup( packages=['ooni', 'ooni.api', 'ooni.kit', 'ooni.nettests', 'ooni.nettests.manipulation', 'ooni.nettests.experimental', 'ooni.nettests.scanning', + 'ooni.nettests.blocking', 'ooni.nettests.third_party', 'ooni.templates', 'ooni.tests', 'ooni.utils'],

1 0

[ooni-probe/master] Add coveralls.yml file.
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 229e0c09e93509df68fa4f7be5db0bc37872d204 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:42:18 2013 +0100 Add coveralls.yml file. --- 0 files changed diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..e69de29

1 0

[ooni-probe/master] Merge branch 'feature/coveralls'
by art＠torproject.org 11 Nov '13

11 Nov '13

commit d855e2067b4683be21b3409a504e8c2d7685707c Merge: 10a7580 8787709 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 6 10:41:23 2013 +0100 Merge branch 'feature/coveralls' * feature/coveralls: Add support for running coveralls after travis CI .coveragerc | 2 ++ .travis.yml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Point travis badge at master.
by art＠torproject.org 11 Nov '13

11 Nov '13

commit 9db041ef6c28c71128dc7dfa6f9824dfcc485915 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Nov 6 12:26:50 2013 +0100 Point travis badge at master. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4554641..5126d9f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/TheTorProject/ooni-probe.png?branch=feature/c… +[![Build Status](https://travis-ci.org/TheTorProject/ooni-probe.png?branch=master)](… [![Coverage Status](https://coveralls.io/repos/TheTorProject/ooni-probe/badge.png)](https://coveralls.io/r/TheTorProject/ooni-probe) # ooniprobe - Open Observatory of Network Interference

1 0