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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 45108: Set MacOS packaging variables before ./mach configure

Title: GitLab

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:

Changes:

  • projects/firefox/build
    ... ... @@ -110,6 +110,14 @@ export LANG=C.UTF-8
    110 110 
       patch -p1 < $rootdir/firefoxbrowser-BB-29320.patch
    111 111 
     [% END -%]
    112 112
    113 
    +[% IF c("var/dev_artifacts") -%]
    114 
    +  [% IF c("var/macos") -%]
    115 
    +    export MOZ_PKG_MAC_BACKGROUND=$(find $rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.background  -type f)
    116 
    +    export MOZ_PKG_MAC_DSSTORE=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/nightly.DS_Store
    117 
    +    export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns
    118 
    +  [% END -%]
    119 
    +[% END -%]
    120 
    +
    113 121 
     echo "Starting ./mach configure $(date)"
    114 122 
     ./mach configure \
    115 123 
       --with-distribution-id=org.torproject \
    ... ... @@ -137,12 +145,6 @@ echo "Starting ./mach build $(date)"
    137 145 
     [% IF c("var/dev_artifacts") -%]
    138 146 
       echo "Building development artifacts"
    139 147
    140 
    -  [% IF c("var/macos") -%]
    141 
    -    export MOZ_PKG_MAC_BACKGROUND=$(find $rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.background  -type f)
    142 
    -    export MOZ_PKG_MAC_DSSTORE=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/nightly.DS_Store
    143 
    -    export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns
    144 
    -  [% END -%]
    145 
    -
    146 148 
       # Package the browser and also create all the test artifacts.
    147 149 
       #
    148 150 
       # MOZ_SIMPLE_PACKAGE_NAME will force all artifact files to start with "target",

    • —
    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-build/-/commit/8c6b06c77d43dabeb3f4067147f98b855e1f7061 at 1784218727 

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