[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (e2c53373c56c -> 3c7db5829367)
This is an automated email from the git hooks/post-receive script.
richard pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.
from e2c53373c56c fixup! Firefox preference overrides. new c33d99d17934 dropme! Bug 41426: temporarily bring back stub installer logic so we can delete it in subsequent new fixup commit; new 3c7db5829367 fixup! Base Browser's .mozconfigs.
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes:
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.
commit c33d99d179340e13408c106ca1c6cdba64d434d6 Author: Richard Pospesel richard@torproject.org AuthorDate: Thu Nov 10 22:40:22 2022 +0000
dropme! Bug 41426: temporarily bring back stub installer logic so we can delete it in subsequent new fixup commit; --- browser/confvars.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
diff --git a/browser/confvars.sh b/browser/confvars.sh index 83979ddf4d5b..fe5287677b28 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -5,6 +5,26 @@
MOZ_APP_VENDOR=Mozilla
+if test "$OS_ARCH" = "WINNT"; then + if ! test "$HAVE_64BIT_BUILD"; then + if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ + "$MOZ_UPDATE_CHANNEL" = "nightly-try" -o \ + "$MOZ_UPDATE_CHANNEL" = "aurora" -o \ + "$MOZ_UPDATE_CHANNEL" = "beta" -o \ + "$MOZ_UPDATE_CHANNEL" = "release"; then + if ! test "$MOZ_DEBUG"; then + if ! test "$USE_STUB_INSTALLER"; then + # Expect USE_STUB_INSTALLER from taskcluster for downstream task consistency + echo "ERROR: STUB installer expected to be enabled but" + echo "ERROR: USE_STUB_INSTALLER is not specified in the environment" + exit 1 + fi + MOZ_STUB_INSTALLER=1 + fi + fi + fi +fi + BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser.
commit 3c7db58293670a4ce81c442a66665965a32babda Author: Richard Pospesel richard@torproject.org AuthorDate: Thu Nov 10 23:47:41 2022 +0000
fixup! Base Browser's .mozconfigs.
Bug 41264: base-browser nightly fails to build for windows-i686 --- browser/confvars.sh | 20 -------------------- 1 file changed, 20 deletions(-)
diff --git a/browser/confvars.sh b/browser/confvars.sh index fe5287677b28..83979ddf4d5b 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -5,26 +5,6 @@
MOZ_APP_VENDOR=Mozilla
-if test "$OS_ARCH" = "WINNT"; then - if ! test "$HAVE_64BIT_BUILD"; then - if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ - "$MOZ_UPDATE_CHANNEL" = "nightly-try" -o \ - "$MOZ_UPDATE_CHANNEL" = "aurora" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta" -o \ - "$MOZ_UPDATE_CHANNEL" = "release"; then - if ! test "$MOZ_DEBUG"; then - if ! test "$USE_STUB_INSTALLER"; then - # Expect USE_STUB_INSTALLER from taskcluster for downstream task consistency - echo "ERROR: STUB installer expected to be enabled but" - echo "ERROR: USE_STUB_INSTALLER is not specified in the environment" - exit 1 - fi - MOZ_STUB_INSTALLER=1 - fi - fi - fi -fi - BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
tor-commits@lists.torproject.org
-
gitolite role