This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.5.0esr-12.0-2 in repository tor-browser.
commit dba2cf96df9a178d5e83224b96264522d791d9f1 Author: Henry Wilkes henry@torproject.org AuthorDate: Fri Sep 30 15:04:37 2022 +0100
Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
tor-browser#41285: Enable fluent warnings. --- build/moz.configure/init.configure | 10 ++++++++++ intl/l10n/Localization.h | 3 ++- modules/libpref/init/all.js | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 81f500a0b752..587501874ffd 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -1095,6 +1095,16 @@ set_define("MOZ_UPDATE_CHANNEL", update_channel) add_old_configure_assignment("MOZ_UPDATE_CHANNEL", update_channel)
+# Add a TOR_BROWSER_NIGHTLY_BUILD flag to use when MOZ_UPDATE_CHANNEL cannot be +# used. For example, for the C++ preprocessor. See tor-browser#41340 +@depends("--enable-update-channel") +def tor_browser_nightly_build(channel): + if channel and channel[0] in ["default", "nightly"]: + return True + +set_define("TOR_BROWSER_NIGHTLY_BUILD", tor_browser_nightly_build) + + option( env="MOZBUILD_STATE_PATH", nargs=1, diff --git a/intl/l10n/Localization.h b/intl/l10n/Localization.h index 54c78f68dbe7..ebe285be4772 100644 --- a/intl/l10n/Localization.h +++ b/intl/l10n/Localization.h @@ -51,7 +51,8 @@ namespace intl { return true; }
-#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) + // See tor-browser#41285 +#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) || defined(TOR_BROWSER_NIGHTLY_BUILD) dom::Document* doc = nullptr; if (aGlobal) { nsPIDOMWindowInner* innerWindow = aGlobal->AsInnerWindow(); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 94726098b214..9f820061f897 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -4324,7 +4324,7 @@ pref("devtools.policy.disabled", false); // Enable deprecation warnings. pref("devtools.errorconsole.deprecation_warnings", true);
-#ifdef NIGHTLY_BUILD +#if defined(NIGHTLY_BUILD) || defined(TOR_BROWSER_NIGHTLY_BUILD) // Don't show the Browser Toolbox prompt on local builds / nightly. pref("devtools.debugger.prompt-connection", false, sticky); #else