This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push: new f460bf0f08f67 fixup! TB3: Tor Browser's official .mozconfigs. f460bf0f08f67 is described below

commit f460bf0f08f6705fa908b4db46f13de5144f9250 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon May 23 17:01:24 2022 +0200

fixup! TB3: Tor Browser's official .mozconfigs.

Bug 40477: Add a common mozconfig Bug 23656: Use .mozconfig files in tor-browser repo for rbm builds (WIP) --- .mozconfig | 40 ------------------- .mozconfig-asan | 46 --------------------- .mozconfig-mac | 57 --------------------------- .mozconfig-mingw | 32 --------------- browser/config/mozconfigs/base-browser | 34 ++++++++++++++++ browser/config/mozconfigs/tor-browser | 8 ++++ .mozconfig-android => mozconfig-android-armv7 | 0 mozconfig-linux-i686 | 9 +++++ mozconfig-linux-x86_64 | 9 +++++ mozconfig-linux-x86_64-asan | 22 +++++++++++ mozconfig-linux-x86_64-dev | 14 +++++++ mozconfig-macos-x86_64 | 5 +++ mozconfig-windows-i686 | 11 ++++++ mozconfig-windows-x86_64 | 11 ++++++ 14 files changed, 123 insertions(+), 175 deletions(-)

diff --git a/.mozconfig b/.mozconfig deleted file mode 100755 index 7655f628415e9..0000000000000 --- a/.mozconfig +++ /dev/null @@ -1,40 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# This mozconfig file is not used in official Tor Browser builds. -# It is only intended to be used when doing incremental Linux builds -# during development. The platform-specific mozconfig configuration -# files used in official Tor Browser releases can be found in the -# tor-browser-build repo: -# https://gitweb.torproject.org/builders/tor-browser-build.git/ -# under: -# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= - -ac_add_options --enable-tor-launcher -ac_add_options --with-tor-browser-version=dev-build -ac_add_options --disable-tor-browser-update -ac_add_options --enable-verify-mar diff --git a/.mozconfig-asan b/.mozconfig-asan deleted file mode 100644 index 8bee813bfee8a..0000000000000 --- a/.mozconfig-asan +++ /dev/null @@ -1,46 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -# We need to add -ldl explicitely due to bug 1213698 -export LDFLAGS="-fsanitize=address -ldl" - -# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff -# (which is part of mar-tools and is not distributed to end-users) with -# ASan. See bug 17858. -export HOST_CFLAGS="" -export HOST_CXXFLAGS="" -export HOST_LDFLAGS="-ldl" - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' - -ac_add_options --enable-address-sanitizer -ac_add_options --disable-jemalloc -ac_add_options --disable-elf-hack -ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mac b/.mozconfig-mac deleted file mode 100644 index 5b4624ef1f673..0000000000000 --- a/.mozconfig-mac +++ /dev/null @@ -1,57 +0,0 @@ -# ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" - -CROSS_CCTOOLS_PATH=$topsrcdir/cctools -CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk -CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" - -export CC="$topsrcdir/clang/bin/clang $FLAGS" -export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" -export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" -export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- -#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically -export AR=${TOOLCHAIN_PREFIX}ar -export RANLIB=${TOOLCHAIN_PREFIX}ranlib -export STRIP=${TOOLCHAIN_PREFIX}strip -export OTOOL=${TOOLCHAIN_PREFIX}otool -export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil - -export HOST_CC="$topsrcdir/clang/bin/clang" -export HOST_CXX="$topsrcdir/clang/bin/clang++" -export HOST_CPP="$topsrcdir/clang/bin/clang -E" -export HOST_CFLAGS="-g" -export HOST_CXXFLAGS="-g" -export HOST_LDFLAGS="-g" - -ac_add_options --target=x86_64-apple-darwin -ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-application=browser -ac_add_options --enable-strip -ac_add_options --enable-official-branding -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --disable-debug - -ac_add_options --enable-tor-browser-data-outside-app-dir -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mingw b/.mozconfig-mingw deleted file mode 100644 index ce6ace1dad67f..0000000000000 --- a/.mozconfig-mingw +++ /dev/null @@ -1,32 +0,0 @@ -CROSS_COMPILE=1 - -ac_add_options --enable-application=browser -ac_add_options --target=i686-w64-mingw32 -ac_add_options --with-toolchain-prefix=i686-w64-mingw32- -ac_add_options --enable-default-toolkit=cairo-windows -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-strip -ac_add_options --enable-official-branding - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar -ac_add_options --disable-bits-download - -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= -ac_add_options --disable-default-browser-agent diff --git a/browser/config/mozconfigs/base-browser b/browser/config/mozconfigs/base-browser new file mode 100644 index 0000000000000..2b3e2bb8fa852 --- /dev/null +++ b/browser/config/mozconfigs/base-browser @@ -0,0 +1,34 @@ +# Shared build settings and settings to enhance security and privacy. + +. $topsrcdir/browser/config/mozconfig + +if test -f "$topsrcdir/mozconfig-toolchain"; then + . $topsrcdir/mozconfig-toolchain +fi + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ + +ac_add_options --enable-official-branding +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-rust-simd + +ac_add_options --enable-bundled-fonts + +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --disable-crashreporter +# Before removing, please notice that WebRTC does not work on mingw (Bug 1393901) +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection +# Disable system policies, see #30575 and #32418 +# Uncomment after the changes on "Bug 32418: Allow updates to be disabled via an enterprise policy." +# ac_add_options --disable-system-policies + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/browser/config/mozconfigs/tor-browser b/browser/config/mozconfigs/tor-browser new file mode 100644 index 0000000000000..22f5184aa73b1 --- /dev/null +++ b/browser/config/mozconfigs/tor-browser @@ -0,0 +1,8 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser + +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-verify-mar + +ac_add_options --with-distribution-id=org.torproject diff --git a/.mozconfig-android b/mozconfig-android-armv7 old mode 100755 new mode 100644 similarity index 100% rename from .mozconfig-android rename to mozconfig-android-armv7 diff --git a/mozconfig-linux-i686 b/mozconfig-linux-i686 new file mode 100644 index 0000000000000..4b03732c0e06f --- /dev/null +++ b/mozconfig-linux-i686 @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=i686-linux-gnu + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Bug 31448: ld.gold fails if we don't disable debug-symbols. +# Also, we keep strip enabled. +ac_add_options --disable-debug-symbols diff --git a/mozconfig-linux-x86_64 b/mozconfig-linux-x86_64 new file mode 100644 index 0000000000000..06cf6e75b14fd --- /dev/null +++ b/mozconfig-linux-x86_64 @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +# We want to bundle an own geckodriver, so we can use it for QA and other work +ac_add_options --enable-geckodriver diff --git a/mozconfig-linux-x86_64-asan b/mozconfig-linux-x86_64-asan new file mode 100644 index 0000000000000..ec9c8c086eca4 --- /dev/null +++ b/mozconfig-linux-x86_64-asan @@ -0,0 +1,22 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +# We need to add -ldl explicitely due to bug 1213698 +export LDFLAGS="-fsanitize=address -ldl" + +# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff +# (which is part of mar-tools and is not distributed to end-users) with +# ASan. See bug 17858. +export HOST_CFLAGS="" +export HOST_CXXFLAGS="" +export HOST_LDFLAGS="-ldl" + +ac_add_options --enable-address-sanitizer +ac_add_options --disable-jemalloc +ac_add_options --disable-elf-hack + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev new file mode 100644 index 0000000000000..b7f78e11a5736 --- /dev/null +++ b/mozconfig-linux-x86_64-dev @@ -0,0 +1,14 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --enable-tor-launcher +ac_add_options --disable-tor-browser-update +ac_add_options --with-tor-browser-version=dev-build diff --git a/mozconfig-macos-x86_64 b/mozconfig-macos-x86_64 new file mode 100644 index 0000000000000..e2286f972e627 --- /dev/null +++ b/mozconfig-macos-x86_64 @@ -0,0 +1,5 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --enable-strip + +ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/mozconfig-windows-i686 b/mozconfig-windows-i686 new file mode 100644 index 0000000000000..78ff05ecc8105 --- /dev/null +++ b/mozconfig-windows-i686 @@ -0,0 +1,11 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- + +ac_add_options --enable-strip + +# Bits is Background Intelligent Transfer Service +ac_add_options --disable-bits-download +ac_add_options --disable-maintenance-service +ac_add_options --disable-default-browser-agent diff --git a/mozconfig-windows-x86_64 b/mozconfig-windows-x86_64 new file mode 100644 index 0000000000000..93b7a28fd361f --- /dev/null +++ b/mozconfig-windows-x86_64 @@ -0,0 +1,11 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=x86_64-w64-mingw32 +ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- + +ac_add_options --enable-strip + +# Bits is Background Intelligent Transfer Service +ac_add_options --disable-bits-download +ac_add_options --disable-maintenance-service +ac_add_options --disable-default-browser-agent