Commit 9cbe67a3 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

TB 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds

#41285: Enable fluent warnings.
parent b4f74a5d
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,17 @@ set_config("MOZ_UPDATE_CHANNEL", update_channel)
set_define("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,
+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ namespace intl {
    const nsTArray<nsCString>& aErrors, ErrorResult& aRv,
    nsIGlobalObject* aGlobal) {
  if (!aErrors.IsEmpty()) {
#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->GetAsInnerWindow();
+1 −1
Original line number Diff line number Diff line
@@ -3919,7 +3919,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