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

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-140.0a1-15.0-2] 2 commits: fixup! Tweaks to the build system

Title: GitLab

brizental pushed to branch mullvad-browser-140.0a1-15.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

  • 2f0fa637
    by Beatriz Rizental at 2025-06-23T11:40:00+02:00 
    fixup! Tweaks to the build system

Make it possible to provide MOZ_PKG_MAC_DSSTORE, MOZ_PKG_MAC_BACKGROUND,
MOZ_PKG_MAC_ICON as environment variables. These files are not where the
build system expects it.

In our build system these files are in
tor-browser-build/projects/browser/Bundle-Data/BaseBrowser.dmg while the
build system expects it to be in browser/branding/tb-*.

For ./mach package to work properly when building for macos we need
these locations. Passing them as env vars is fine for building artifacts
in tbb.
  • 72569bc4
    by Beatriz Rizental at 2025-06-23T11:40:14+02:00 
    fixup! Tweaks to the build system

Disable inclusion of browser/installer/windows into packaged development
artifacts. That file is not included by our builds -- at least not by
the ones done by tor-browser-build.

Attempting to zip the unexisting folder will crash `./mach package` when
building inside tor-browser-build.

2 changed files:

Changes:

  • toolkit/mozapps/installer/packager.mk
    ... ... @@ -135,7 +135,7 @@ make-package: FORCE
    135 135 
     	$(MAKE) make-package-internal
    136 136 
     ifeq (WINNT,$(OS_ARCH))
    137 137 
     ifeq ($(MOZ_PKG_FORMAT),ZIP)
    138 
    -	$(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer
    138 
    +#	$(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer
    139 139 
     endif
    140 140 
     endif
    141 141 
     ifdef MOZ_AUTOMATION

  • toolkit/mozapps/installer/upload-files.mk
    ... ... @@ -205,9 +205,9 @@ ifeq ($(MOZ_PKG_FORMAT),DMG)
    205 205
    206 206 
       _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd)
    207 207 
       PKG_DMG_SOURCE = $(MOZ_PKG_DIR)
    208 
    -  MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
    209 
    -  MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
    210 
    -  MOZ_PKG_MAC_ICON=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
    208 
    +  MOZ_PKG_MAC_DSSTORE?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
    209 
    +  MOZ_PKG_MAC_BACKGROUND?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
    210 
    +  MOZ_PKG_MAC_ICON?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns
    211 211 
       INNER_MAKE_PACKAGE = \
    212 212 
         $(call py_action,make_dmg, \
    213 213 
             $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \

    • —
    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/mullvad-browser/-/compare/4ca6317f9c0bea284884df1a7291d18a247bd5bf...72569bc4f91decfb622b16c2a1117ef315f91f77 at 1750671746 

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