brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8c6b06c7 by Beatriz Rizental at 2026-07-16T01:27:38-03:00 Bug 45108: Set MacOS packaging variables before ./mach configure These now need to be set before configure so that the right configuration and environment files are created and available at packaging time. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -110,6 +110,14 @@ export LANG=C.UTF-8 patch -p1 < $rootdir/firefoxbrowser-BB-29320.patch [% END -%] +[% IF c("var/dev_artifacts") -%] + [% IF c("var/macos") -%] + export MOZ_PKG_MAC_BACKGROUND=$(find $rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.background -type f) + export MOZ_PKG_MAC_DSSTORE=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/nightly.DS_Store + export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns + [% END -%] +[% END -%] + echo "Starting ./mach configure $(date)" ./mach configure \ --with-distribution-id=org.torproject \ @@ -137,12 +145,6 @@ echo "Starting ./mach build $(date)" [% IF c("var/dev_artifacts") -%] echo "Building development artifacts" - [% IF c("var/macos") -%] - export MOZ_PKG_MAC_BACKGROUND=$(find $rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.background -type f) - export MOZ_PKG_MAC_DSSTORE=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/nightly.DS_Store - export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns - [% END -%] - # Package the browser and also create all the test artifacts. # # MOZ_SIMPLE_PACKAGE_NAME will force all artifact files to start with "target", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8c... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8c... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help