This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch master in repository builders/tor-browser-build.
commit efea360a86508ef81bbb18aeca2ea04bb98ff0d6 Author: Nicolas Vigier boklm@torproject.org AuthorDate: Thu Jun 9 15:25:29 2022 +0200
Bug 40499: Update projects/firefox to build base-browser --- projects/firefox/build | 33 +++++++++++++++++---------------- projects/firefox/config | 10 ++++++---- 2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build index 6db1bf4..a044163 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -59,11 +59,7 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
-[% IF c("var/osx") %] - mkdir -p "$distdir/Tor Browser.app/Contents/MacOS" -[% ELSE %] - mkdir -p $distdir/Browser -[% END %] +mkdir -p $distdir/[% IF ! c("var/osx") %]Browser[% END %]
cd /var/tmp/build/[% project %]-[% c("version") %] mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig @@ -92,8 +88,10 @@ fi patch -p1 < $rootdir/namecoin-etld.patch [% END -%]
-# Place a copy of the Tor Launcher sources under browser/extensions -tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') %] +[% IF c("var/tor-browser") -%] + # Place a copy of the Tor Launcher sources under browser/extensions + tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') %] +[% END -%]
[% IF c("var/namecoin") %] pushd toolkit/torproject/torbutton @@ -101,7 +99,7 @@ tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') popd [% END %]
-[% IF c("var/nightly") -%] +[% IF c("var/nightly") && c("var/tor-browser") -%] # Set update url for nightly (#33402 / #40033) sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... c("var/osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%|' build/application.ini.in [% END -%] @@ -111,18 +109,21 @@ rm -f js/src/configure
export MACH_USE_SYSTEM_PYTHON=1
-./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %] +./mach configure [% IF c("var/tor-browser") %]--with-tor-browser-version=[% c("var/torbrowser_version") %][% END %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/channel") %] --enable-bundled-fonts [% IF c("var/tor-browser") %]--with-branding=[% c("var/branding_directory") %][% END %]
./mach build --verbose ./mach build stage-package
[% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir + [% IF c("var/base-browser") -%] + mv "$distdir/Firefox.app" "$distdir/[% c('var/Project_Name') %].app" + [% END -%] # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f "$distdir/Tor Browser.app/Contents/MacOS/firefox-bin" + rm -f "$distdir/[% c('var/Project_Name') %].app/Contents/MacOS/firefox-bin"
# Adjust the Info.plist file - INFO_PLIST="$distdir/Tor Browser.app/Contents/Info.plist" + INFO_PLIST="$distdir/[% c('var/Project_Name') %].app/Contents/Info.plist" mv "$INFO_PLIST" tmp.plist python3 $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > "$INFO_PLIST" rm -f tmp.plist @@ -221,13 +222,13 @@ cd $distdir [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] [% ELSIF c("var/osx") %] - [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/omni.ja"' }) %] - [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %] + [% c("var/rezip", { rezip_file => '"' _ c("var/Project_Name") _ '.app/Contents/Resources/omni.ja"' }) %] + [% c("var/rezip", { rezip_file => '"' _ c("var/Project_Name") _ '.app/Contents/Resources/browser/omni.ja"' }) %] [% END %]
[% IF c("var/osx"); - SET browserdir='"Tor Browser.app/Contents"'; + SET browserdir='"' _ c("var/Project_Name") _ '.app/Contents"'; ELSE; SET browserdir='Browser'; END; @@ -239,13 +240,13 @@ END;
[% c('tar', { tar_src => [ browserdir ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/browser.tar.gz', }) %]
[% IF c("var/linux-x86_64") %] [% c('tar', { tar_src => [ 'Debug' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/browser-debug.tar.xz', }) %] [% IF !c("var/asan") %] [% c('tar', { diff --git a/projects/firefox/config b/projects/firefox/config index 616cb94..6ddabbb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +filename: 'firefox-[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 @@ -12,7 +12,8 @@ container: var: firefox_platform_version: 91.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 11.5 + browser_branch: '11.5-1' + browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -61,7 +62,7 @@ targets: branding_directory: 'browser/branding/official'
nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 var: branding_directory: 'browser/branding/nightly' @@ -170,6 +171,7 @@ input_files: enable: '[% c("var/linux") %]' - project: tor-launcher name: tor-launcher + enable: '[% c("var/tor-browser") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin