[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 3 commits: fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation

Title: GitLab

brizental pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • 9eeb936a
    by Beatriz Rizental at 2026-01-14T10:36:44-03:00 
    fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation

When building with tests enabled, the current patch was breaking the
generated Makefile. This commit fixes it.
  • e664fbe8
    by Beatriz Rizental at 2026-01-14T10:36:44-03:00 
    fixup! BB 43564: Modify ./mach bootstrap for Base Browser

We don't want to bootstrap OONX. It's a ML tool, not used.
  • 7e98980e
    by Beatriz Rizental at 2026-01-14T10:36:45-03:00 
    fixup! BB 43564: Modify ./mach bootstrap for Base Browser

Use our MacOS SDK mirror when bootstrapping for Mac.

3 changed files:

Changes:

  • browser/Makefile.in
    ... ... @@ -7,6 +7,7 @@ include $(topsrcdir)/config/rules.mk
    7 7 
     ifdef MAKENSISU
    8 8
    9 9 
     ifdef ENABLE_TESTS
    10 
    +libs::
    10 11 
     	$(MAKE) -C installer/windows install_deps
    11 12 
     endif #ENABLE_TESTS
    12 13

  • build/moz.configure/bootstrap.configure
    ... ... @@ -165,6 +165,7 @@ def bootstrap_path(path, **kwargs):
    165 165 
             when=when,
    166 166 
         )
    167 167 
         @imports("os")
    168 
    +    @imports("re")
    168 169 
         @imports("subprocess")
    169 170 
         @imports("sys")
    170 171 
         @imports("mozbuild.tbbutils")
    ... ... @@ -356,6 +357,23 @@ def bootstrap_path(path, **kwargs):
    356 357 
                         + command["arguments"]
    357 358 
                         + [path_parts[0]]
    358 359 
                     )
    360 
    +
    361 
    +                # BIG HACK: Replace the Apple CDN link with our mirror,
    362 
    +                # otherwise bootstrapping will fail whenever a new MacOS SDK
    363 
    +                # is released, since Apple seems to retire the previous link everytime.
    364 
    +                # Our mirror serves an _unmodified_ version of the file.
    365 
    +                macosx_sdk_match = re.match(r"^MacOSX(.*)\.sdk$", path_parts[0])
    366 
    +                if macosx_sdk_match:
    367 
    +                    version = macosx_sdk_match.group(1)
    368 
    +                    command = [
    369 
    +                        re.sub(
    370 
    +                            r"https://swcdn\.apple\.com/.*/CLTools_macOSNMOS_SDK\.pkg",
    371 
    +                            f"https://build-sources.tbb.torproject.org/CLTools_macOSNMOS_SDK-{version}.pkg",
    372 
    +                            c,
    373 
    +                        )
    374 
    +                        for c in command
    375 
    +                    ]
    376 
    +
    359 377 
                     # Clean up anything that was bootstrapped previously before going
    360 378 
                     # forward. In other cases, that's taken care of by mach artifact toolchain.
    361 379 
                     rmtree(

  • toolkit/moz.configure
    ... ... @@ -4241,9 +4241,8 @@ with only_when(~artifact_builds):
    4241 4241
    4242 4242 
         @depends("--with-onnx-runtime")
    4243 4243 
         def need_boostrap_onnxruntime(with_onnx_runtime):
    4244 
    -        return (with_onnx_runtime and len(with_onnx_runtime) == 0) or (
    4245 
    -            with_onnx_runtime.origin == "default"
    4246 
    -        )
    4244 
    +        # tor-browser#44412: Prevent ONNX from ever getting bootstrapped.
    4245 
    +        return False
    4247 4246
    4248 4247 
         @depends(
    4249 4248 
             "--with-onnx-runtime",

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1b61434354f1ee8ca21f39359c7d5b6d2811542...7e98980eaf76f0e238b3af67707a1bde2096225b at 1768398054 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx