brizental pushed to branch tor-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: fadec010 by Beatriz Rizental at 2025-06-12T17:31:27+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. - - - - - d1bcbcb1 by Beatriz Rizental at 2025-06-12T17:31:27+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. - - - - - 315fd439 by Beatriz Rizental at 2025-06-12T17:31:28+02:00 BB 43843: Do not bootstrap MacOS packaging tools if available Do not bootstrap MacOS packing tools if they are already available in the environment. This can be uplifted. - - - - - 3 changed files: - python/mozbuild/mozbuild/action/make_dmg.py - toolkit/mozapps/installer/packager.mk - toolkit/mozapps/installer/upload-files.mk Changes: ===================================== python/mozbuild/mozbuild/action/make_dmg.py ===================================== @@ -7,6 +7,7 @@ import platform import sys from pathlib import Path +import buildconfig from mozpack import dmg from mozbuild.bootstrap import bootstrap_toolchain @@ -46,9 +47,11 @@ def main(args): ) # Resolve required tools - dmg_tool = bootstrap_toolchain("dmg/dmg") - hfs_tool = bootstrap_toolchain("dmg/hfsplus") - mkfshfs_tool = bootstrap_toolchain("hfsplus/newfs_hfs") + dmg_tool = buildconfig.substs.get("DMG_TOOL") or bootstrap_toolchain("dmg/dmg") + hfs_tool = buildconfig.substs.get("HFS_TOOL") or bootstrap_toolchain("dmg/hfsplus") + mkfshfs_tool = buildconfig.substs.get("MKFSHFS") or bootstrap_toolchain( + "hfsplus/newfs_hfs" + ) dmg.create_dmg( source_directory=Path(options.inpath), ===================================== toolkit/mozapps/installer/packager.mk ===================================== @@ -135,7 +135,7 @@ make-package: FORCE $(MAKE) make-package-internal ifeq (WINNT,$(OS_ARCH)) ifeq ($(MOZ_PKG_FORMAT),ZIP) - $(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer +# $(MAKE) -C windows ZIP_IN='$(ABS_DIST)/$(PACKAGE)' installer endif endif ifdef MOZ_AUTOMATION ===================================== toolkit/mozapps/installer/upload-files.mk ===================================== @@ -205,9 +205,9 @@ ifeq ($(MOZ_PKG_FORMAT),DMG) _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) PKG_DMG_SOURCE = $(MOZ_PKG_DIR) - MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore - MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png - MOZ_PKG_MAC_ICON=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns + MOZ_PKG_MAC_DSSTORE?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore + MOZ_PKG_MAC_BACKGROUND?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png + MOZ_PKG_MAC_ICON?=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/disk.icns INNER_MAKE_PACKAGE = \ $(call py_action,make_dmg, \ $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/759ac06... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/759ac06... You're receiving this email because of your account on gitlab.torproject.org.