Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser
Commits:
002dd17a by Pier Angelo Vendrame at 2023-02-15T18:22:05+00:00
Bug 41603: Customize the creation of MOZ_SOURCE_URL
MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and
MOZ_SOURCE_CHANGESET.
But the code takes for granted that it refers to a Hg instance, so it
combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`.
With this commit, we change this logic to combine them to create a URL
that is valid for GitLab.
$MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag.
If that is needed, we could use /-/tree/, instead of /-/commit/.
- - - - -
1 changed file:
- build/variables.py
Changes:
=====================================
build/variables.py
=====================================
@@ -97,7 +97,7 @@ def source_repo_header(output):
output.write("#define MOZ_SOURCE_STAMP %s\n" % changeset)
if repo and buildconfig.substs.get("MOZ_INCLUDE_SOURCE_INFO"):
- source = "%s/rev/%s" % (repo, changeset)
+ source = "%s/-/commit/%s" % (repo, changeset)
output.write("#define MOZ_SOURCE_REPO %s\n" % repo)
output.write("#define MOZ_SOURCE_URL %s\n" % source)
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/002dd17…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/002dd17…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
93de138c by Pier Angelo Vendrame at 2023-02-15T15:24:47+00:00
fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
Bug 41628: Disable Nimbus and Normandy components at compile time
(cherry picked from commit 34ed82f6c02a8dc5ed8390fa664e2f63aeadc303)
- - - - -
1 changed file:
- toolkit/components/moz.build
Changes:
=====================================
toolkit/components/moz.build
=====================================
@@ -122,10 +122,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
"components.conf",
]
+# tor-browser#41628: Disable Normandy and Nimbus at compile time
if CONFIG["MOZ_BUILD_APP"] == "browser":
- DIRS += ["normandy", "messaging-system"]
-
-DIRS += ["nimbus"]
+ DIRS += ["messaging-system"]
if CONFIG["MOZ_BACKGROUNDTASKS"]:
DIRS += ["backgroundtasks"]
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/93de138…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/93de138…
You're receiving this email because of your account on gitlab.torproject.org.