[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40805: Use the version flag for all our browsers

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
8acfc49a by Pier Angelo Vendrame at 2023-03-10T09:26:28+01:00
Bug 40805: Use the version flag for all our browsers

- - - - -
1dbed39a by Pier Angelo Vendrame at 2023-03-10T09:26:44+01:00
Bug 40806: Update the macOS mozconfig name

- - - - -


3 changed files:

- projects/firefox/build
- projects/firefox/mozconfig
- projects/geckoview/build


Changes:

=====================================
projects/firefox/build
=====================================
@@ -168,8 +168,8 @@ export LANG=C.UTF-8
 
 ./mach configure \
   --with-distribution-id=org.torproject \
+  --with-base-browser-version=[% c("var/torbrowser_version") %] \
   [% IF c("var/tor-browser") -%]
-        --with-tor-browser-version=[% c("var/torbrowser_version") %] \
         --enable-update-channel=[% c("var/channel") %] \
   [% END %] \
   [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \


=====================================
projects/firefox/mozconfig
=====================================
@@ -1,4 +1,4 @@
-. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos-x86_64'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %]
+. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %]
 
 [% IF c("var/linux") -%]
   # We want to build with clang now and point to the GCC toolchain until #29041 is


=====================================
projects/geckoview/build
=====================================
@@ -68,7 +68,7 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 # Create .mozbuild to avoid interactive prompt in configure
 mkdir "$HOME/.mozbuild"
 ./mach configure \
-    --with-tor-browser-version=[% c("var/torbrowser_version") %] \
+    --with-base-browser-version=[% c("var/torbrowser_version") %] \
     [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
 
 ./mach build --verbose



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/fffda1fdc3bbbee4b3a7a3d1057ae764c9641467...1dbed39ac1fe83e9630dedbd7078580b6a9df20b

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/fffda1fdc3bbbee4b3a7a3d1057ae764c9641467...1dbed39ac1fe83e9630dedbd7078580b6a9df20b
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230310/599b7c28/attachment-0001.htm>