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 70dc7d9f9bbcd5439dcf72b7c48e405756f5ef95 Author: Nicolas Vigier boklm@torproject.org AuthorDate: Thu Jun 9 15:05:56 2022 +0200

Bug 40501: Add base-browser support to projects/release/config --- Makefile | 112 +++++++++++++++--------------- projects/release/build | 28 ++++---- projects/release/config | 176 +++++++++++++++++++++++++----------------------- 3 files changed, 165 insertions(+), 151 deletions(-)

diff --git a/Makefile b/Makefile index c4b14ee..6ccb520 100644 --- a/Makefile +++ b/Makefile @@ -3,172 +3,172 @@ rbm=./rbm/rbm all: release

release: submodule-update - $(rbm) build release --target release --target torbrowser-all + $(rbm) build release --target release --target browser-all --target torbrowser

release-android: submodule-update - $(rbm) build release --target release --target torbrowser-all-android + $(rbm) build release --target release --target browser-all-android --target torbrowser

release-android-armv7: submodule-update - $(rbm) build release --target release --target torbrowser-android-armv7 + $(rbm) build release --target release --target browser-android-armv7 --target torbrowser

release-android-x86: submodule-update - $(rbm) build release --target release --target torbrowser-android-x86 + $(rbm) build release --target release --target browser-android-x86 --target torbrowser

release-android-x86_64: submodule-update - $(rbm) build release --target release --target torbrowser-android-x86_64 + $(rbm) build release --target release --target browser-android-x86_64 --target torbrowser

release-android-aarch64: submodule-update - $(rbm) build release --target release --target torbrowser-android-aarch64 + $(rbm) build release --target release --target browser-android-aarch64 --target torbrowser

release-desktop: submodule-update - $(rbm) build release --target release --target torbrowser-all-desktop + $(rbm) build release --target release --target browser-all-desktop --target torbrowser

release-linux-x86_64: submodule-update - $(rbm) build release --target release --target torbrowser-linux-x86_64 + $(rbm) build release --target release --target browser-linux-x86_64 --target torbrowser

release-linux-x86_64-asan: submodule-update - $(rbm) build release --target release --target torbrowser-linux-x86_64-asan + $(rbm) build release --target release --target browser-linux-x86_64-asan --target torbrowser

release-linux-i686: submodule-update - $(rbm) build release --target release --target torbrowser-linux-i686 + $(rbm) build release --target release --target browser-linux-i686 --target torbrowser

release-windows-i686: submodule-update - $(rbm) build release --target release --target torbrowser-windows-i686 + $(rbm) build release --target release --target browser-windows-i686 --target torbrowser

release-windows-x86_64: submodule-update - $(rbm) build release --target release --target torbrowser-windows-x86_64 + $(rbm) build release --target release --target browser-windows-x86_64 --target torbrowser

release-osx-x86_64: submodule-update - $(rbm) build release --target release --target torbrowser-osx-x86_64 + $(rbm) build release --target release --target browser-osx-x86_64 --target torbrowser

release-src: submodule-update - $(rbm) build release --target release --target torbrowser-src + $(rbm) build release --target release --target browser-src --target torbrowser

alpha: submodule-update - $(rbm) build release --target alpha --target torbrowser-all + $(rbm) build release --target alpha --target browser-all --target torbrowser

alpha-android: submodule-update - $(rbm) build release --target alpha --target torbrowser-all-android + $(rbm) build release --target alpha --target browser-all-android --target torbrowser

alpha-android-armv7: submodule-update - $(rbm) build release --target alpha --target torbrowser-android-armv7 + $(rbm) build release --target alpha --target browser-android-armv7 --target torbrowser

alpha-android-x86: submodule-update - $(rbm) build release --target alpha --target torbrowser-android-x86 + $(rbm) build release --target alpha --target browser-android-x86 --target torbrowser

alpha-android-x86_64: submodule-update - $(rbm) build release --target alpha --target torbrowser-android-x86_64 + $(rbm) build release --target alpha --target browser-android-x86_64 --target torbrowser

alpha-android-aarch64: submodule-update - $(rbm) build release --target alpha --target torbrowser-android-aarch64 + $(rbm) build release --target alpha --target browser-android-aarch64 --target torbrowser

alpha-desktop: submodule-update - $(rbm) build release --target alpha --target torbrowser-all-desktop + $(rbm) build release --target alpha --target browser-all-desktop --target torbrowser

alpha-linux-x86_64: submodule-update - $(rbm) build release --target alpha --target torbrowser-linux-x86_64 + $(rbm) build release --target alpha --target browser-linux-x86_64 --target torbrowser

alpha-linux-x86_64-asan: submodule-update - $(rbm) build release --target alpha --target torbrowser-linux-x86_64-asan + $(rbm) build release --target alpha --target browser-linux-x86_64-asan --target torbrowser

alpha-linux-i686: submodule-update - $(rbm) build release --target alpha --target torbrowser-linux-i686 + $(rbm) build release --target alpha --target browser-linux-i686 --target torbrowser

alpha-windows-i686: submodule-update - $(rbm) build release --target alpha --target torbrowser-windows-i686 + $(rbm) build release --target alpha --target browser-windows-i686 --target torbrowser

alpha-windows-x86_64: submodule-update - $(rbm) build release --target alpha --target torbrowser-windows-x86_64 + $(rbm) build release --target alpha --target browser-windows-x86_64 --target torbrowser

alpha-osx-x86_64: submodule-update - $(rbm) build release --target alpha --target torbrowser-osx-x86_64 + $(rbm) build release --target alpha --target browser-osx-x86_64 --target torbrowser

alpha-src: submodule-update - $(rbm) build release --target alpha --target torbrowser-src + $(rbm) build release --target alpha --target browser-src --target torbrowser

nightly: submodule-update - $(rbm) build release --target nightly --target torbrowser-all + $(rbm) build release --target nightly --target browser-all --target torbrowser

nightly-android: submodule-update - $(rbm) build release --target nightly --target torbrowser-all-android + $(rbm) build release --target nightly --target browser-all-android --target torbrowser

nightly-android-armv7: submodule-update - $(rbm) build release --target nightly --target torbrowser-android-armv7 + $(rbm) build release --target nightly --target browser-android-armv7 --target torbrowser

nightly-android-x86: submodule-update - $(rbm) build release --target nightly --target torbrowser-android-x86 + $(rbm) build release --target nightly --target browser-android-x86 --target torbrowser

nightly-android-x86_64: submodule-update - $(rbm) build release --target nightly --target torbrowser-android-x86_64 + $(rbm) build release --target nightly --target browser-android-x86_64 --target torbrowser

nightly-android-aarch64: submodule-update - $(rbm) build release --target nightly --target torbrowser-android-aarch64 + $(rbm) build release --target nightly --target browser-android-aarch64 --target torbrowser

nightly-desktop: submodule-update - $(rbm) build release --target nightly --target torbrowser-all-desktop + $(rbm) build release --target nightly --target browser-all-desktop --target torbrowser

nightly-linux-x86_64: submodule-update - $(rbm) build release --target nightly --target torbrowser-linux-x86_64 + $(rbm) build release --target nightly --target browser-linux-x86_64 --target torbrowser

nightly-linux-x86_64-asan: submodule-update - $(rbm) build release --target nightly --target torbrowser-linux-x86_64-asan + $(rbm) build release --target nightly --target browser-linux-x86_64-asan --target torbrowser

nightly-linux-i686: submodule-update - $(rbm) build release --target nightly --target torbrowser-linux-i686 + $(rbm) build release --target nightly --target browser-linux-i686 --target torbrowser

nightly-windows-i686: submodule-update - $(rbm) build release --target nightly --target torbrowser-windows-i686 + $(rbm) build release --target nightly --target browser-windows-i686 --target torbrowser

nightly-windows-x86_64: submodule-update - $(rbm) build release --target nightly --target torbrowser-windows-x86_64 + $(rbm) build release --target nightly --target browser-windows-x86_64 --target torbrowser

nightly-osx-x86_64: submodule-update - $(rbm) build release --target nightly --target torbrowser-osx-x86_64 + $(rbm) build release --target nightly --target browser-osx-x86_64 --target torbrowser

nightly-src: submodule-update - $(rbm) build release --target nightly --target torbrowser-src + $(rbm) build release --target nightly --target browser-src --target torbrowser

testbuild: submodule-update - $(rbm) build release --target testbuild --target torbrowser-all + $(rbm) build release --target testbuild --target browser-all --target torbrowser

testbuild-android: submodule-update - $(rbm) build release --target testbuild --target torbrowser-all-android + $(rbm) build release --target testbuild --target browser-all-android --target torbrowser

testbuild-android-armv7: submodule-update - $(rbm) build release --target testbuild --target torbrowser-android-armv7 + $(rbm) build release --target testbuild --target browser-android-armv7 --target torbrowser

testbuild-android-x86: submodule-update - $(rbm) build release --target testbuild --target torbrowser-android-x86 + $(rbm) build release --target testbuild --target browser-android-x86 --target torbrowser

testbuild-android-x86_64: submodule-update - $(rbm) build release --target testbuild --target torbrowser-android-x86_64 + $(rbm) build release --target testbuild --target browser-android-x86_64 --target torbrowser

testbuild-android-aarch64: submodule-update - $(rbm) build release --target testbuild --target torbrowser-android-aarch64 + $(rbm) build release --target testbuild --target browser-android-aarch64 --target torbrowser

testbuild-desktop: submodule-update - $(rbm) build release --target testbuild --target torbrowser-all-desktop + $(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser

testbuild-linux-x86_64: submodule-update - $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 + $(rbm) build release --target testbuild --target browser-linux-x86_64 --target torbrowser

testbuild-linux-x86_64-asan: submodule-update - $(rbm) build release --target testbuild --target torbrowser-linux-x86_64-asan + $(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target torbrowser

testbuild-linux-i686: submodule-update - $(rbm) build release --target testbuild --target torbrowser-linux-i686 + $(rbm) build release --target testbuild --target browser-linux-i686 --target torbrowser

testbuild-windows-x86_64: submodule-update - $(rbm) build release --target testbuild --target torbrowser-windows-x86_64 + $(rbm) build release --target testbuild --target browser-windows-x86_64 --target torbrowser

testbuild-windows-i686: submodule-update - $(rbm) build release --target testbuild --target torbrowser-windows-i686 + $(rbm) build release --target testbuild --target browser-windows-i686 --target torbrowser

testbuild-osx-x86_64: submodule-update - $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 + $(rbm) build release --target testbuild --target browser-osx-x86_64 --target torbrowser

testbuild-src: submodule-update - $(rbm) build release --target testbuild --target torbrowser-src-testbuild + $(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser

signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/projects/release/build b/projects/release/build index c859828..96652b8 100644 --- a/projects/release/build +++ b/projects/release/build @@ -4,38 +4,42 @@ [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" -[% IF c("var/torbrowser-android-armv7") -%] +[% IF c("var/browser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-android-x86") -%] +[% IF c("var/browser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-android-x86_64") -%] +[% IF c("var/browser-android-x86_64") -%] mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-android-aarch64") -%] +[% IF c("var/browser-android-aarch64") -%] mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-windows-i686") -%] +[% IF c("var/browser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ + [% IF c("var/tor-browser") -%] + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ + [% END -%] [% END -%] -[% IF c("var/torbrowser-windows-x86_64") -%] +[% IF c("var/browser-windows-x86_64") -%] mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/ + [% IF c("var/tor-browser") -%] + mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/ + [% END -%] [% END -%] -[% IF c("var/torbrowser-osx-x86_64") -%] +[% IF c("var/browser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-linux-i686") -%] +[% IF c("var/browser-linux-i686") -%] mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ [% END -%] -[% IF c("var/torbrowser-linux-x86_64") -%] +[% IF c("var/browser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ [% END -%] [% IF c("var/torbrowser-src") -%] mv [% c('input_files_by_name/src-firefox') %] \ - [% c('input_files_by_name/src-tor-launcher') %] \ + [% IF c("var/tor-browser"); GET c('input_files_by_name/src-tor-launcher'); END %] \ "$destdir"/ [% END -%] cd "$destdir" diff --git a/projects/release/config b/projects/release/config index 8c2974a..3f70e60 100644 --- a/projects/release/config +++ b/projects/release/config @@ -9,77 +9,85 @@ var: containers_target: with_containers

targets: - torbrowser-all: - - torbrowser-linux-x86_64 - - torbrowser-linux-i686 - - torbrowser-windows-i686 - - torbrowser-windows-x86_64 - - torbrowser-osx-x86_64 - - torbrowser-android-armv7 - - torbrowser-android-x86 - - torbrowser-android-x86_64 - - torbrowser-android-aarch64 - - torbrowser-src - torbrowser-all-desktop: - - torbrowser-linux-x86_64 - - torbrowser-linux-i686 - - torbrowser-windows-i686 - - torbrowser-windows-x86_64 - - torbrowser-osx-x86_64 - - torbrowser-src - torbrowser-all-android: - - torbrowser-android-armv7 - - torbrowser-android-x86 - - torbrowser-android-x86_64 - - torbrowser-android-aarch64 - torbrowser-android-armv7: - var: - torbrowser-android-armv7: 1 - torbrowser-android-x86: - var: - torbrowser-android-x86: 1 - torbrowser-android-x86_64: - var: - torbrowser-android-x86_64: 1 - torbrowser-android-aarch64: - var: - torbrowser-android-aarch64: 1 - torbrowser-linux-x86_64: - var: - torbrowser-linux-x86_64: 1 - torbrowser-linux-x86_64-asan: - var: - torbrowser-linux-x86_64: 1 + browser-all: + - browser-linux-x86_64 + - browser-linux-i686 + - browser-windows-i686 + - browser-windows-x86_64 + - browser-osx-x86_64 + - browser-android-armv7 + - browser-android-x86 + - browser-android-x86_64 + - browser-android-aarch64 + - browser-src + browser-all-desktop: + - browser-linux-x86_64 + - browser-linux-i686 + - browser-windows-i686 + - browser-windows-x86_64 + - browser-osx-x86_64 + - browser-src + browser-all-android: + - browser-android-armv7 + - browser-android-x86 + - browser-android-x86_64 + - browser-android-aarch64 + browser-android-armv7: + var: + browser-android-armv7: 1 + browser-android-x86: + var: + browser-android-x86: 1 + browser-android-x86_64: + var: + browser-android-x86_64: 1 + browser-android-aarch64: + var: + browser-android-aarch64: 1 + browser-linux-x86_64: + var: + browser-linux-x86_64: 1 + browser-linux-x86_64-asan: + var: + browser-linux-x86_64: 1 asan-build: '-asan' - torbrowser-linux-i686: + browser-linux-i686: var: - torbrowser-linux-i686: 1 - torbrowser-windows-i686: + browser-linux-i686: 1 + browser-windows-i686: var: - torbrowser-windows-i686: 1 - torbrowser-windows-x86_64: + browser-windows-i686: 1 + browser-windows-x86_64: var: - torbrowser-windows-x86_64: 1 - torbrowser-osx-x86_64: + browser-windows-x86_64: 1 + browser-osx-x86_64: var: - torbrowser-osx-x86_64: 1 - torbrowser-src: + browser-osx-x86_64: 1 + browser-src: var: - torbrowser-src: '[% ! c("var/testbuild") %]' - torbrowser-src-testbuild: + browser-src: '[% ! c("var/testbuild") %]' + browser-src-testbuild: var: - torbrowser-src: 1 + browser-src: 1

notarget: + - torbrowser - release - - torbrowser-all - - torbrowser-all-android - - torbrowser-all-desktop + - browser-all + - browser-all-android + - browser-all-desktop

noversiondir: var: publish_dir: ''

+ torbrowser: + var: + browser_type: torbrowser + basebrowser: + var: + browser_type: basebrowser + release: var: build_target: release @@ -99,7 +107,7 @@ targets: output_dir: 'testbuild' var: testbuild: 1 - build_target: torbrowser-testbuild + build_target: '[% c("var/browser_type") %]-testbuild' publish_dir: ''

no_containers: @@ -119,102 +127,104 @@ input_files: # Release - name: android-armv7 project: tor-browser - enable: '[% c("var/torbrowser-android-armv7") %]' + enable: '[% c("var/browser-android-armv7") %]' target: - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - - torbrowser-android-armv7 + - '[% c("var/browser_type") %]-android-armv7'

- name: android-x86 project: tor-browser - enable: '[% c("var/torbrowser-android-x86") %]' + enable: '[% c("var/browser-android-x86") %]' target: - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - - torbrowser-android-x86 + - '[% c("var/browser_type") %]-android-x86'

- name: android-x86_64 project: tor-browser - enable: '[% c("var/torbrowser-android-x86_64") %]' + enable: '[% c("var/browser-android-x86_64") %]' target: - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - - torbrowser-android-x86_64 + - '[% c("var/browser_type") %]-android-x86_64'

- name: android-aarch64 project: tor-browser - enable: '[% c("var/torbrowser-android-aarch64") %]' + enable: '[% c("var/browser-android-aarch64") %]' target: - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - - torbrowser-android-aarch64 + - '[% c("var/browser_type") %]-android-aarch64'

- name: linux-x86_64 project: tor-browser - enable: '[% c("var/torbrowser-linux-x86_64") %]' + enable: '[% c("var/browser-linux-x86_64") %]' target: - '[% c("var/build_target") %]' - - 'torbrowser-linux-x86_64[% c("var/asan-build") %]' + - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'

- name: linux-i686 project: tor-browser - enable: '[% c("var/torbrowser-linux-i686") %]' + enable: '[% c("var/browser-linux-i686") %]' target: - '[% c("var/build_target") %]' - - torbrowser-linux-i686 + - '[% c("var/browser_type") %]-linux-i686'

- name: windows-i686 project: tor-browser - enable: '[% c("var/torbrowser-windows-i686") %]' + enable: '[% c("var/browser-windows-i686") %]' target: - '[% c("var/build_target") %]' - - torbrowser-windows-i686 + - '[% c("var/browser_type") %]-windows-i686'

- name: windows-x86_64 project: tor-browser - enable: '[% c("var/torbrowser-windows-x86_64") %]' + enable: '[% c("var/browser-windows-x86_64") %]' target: - '[% c("var/build_target") %]' - - torbrowser-windows-x86_64 + - '[% c("var/browser_type") %]-windows-x86_64'

- name: osx-x86_64 project: tor-browser - enable: '[% c("var/torbrowser-osx-x86_64") %]' + enable: '[% c("var/browser-osx-x86_64") %]' target: - '[% c("var/build_target") %]' - - torbrowser-osx-x86_64 + - '[% c("var/browser_type") %]-osx-x86_64'

- name: windows-expert-bundle project: tor - enable: '[% c("var/torbrowser-windows-i686") %]' + enable: '[% c("var/browser-windows-i686") %]' target: - '[% c("var/build_target") %]' - - torbrowser-windows-i686 + - '[% c("var/browser_type") %]-windows-i686' - expert-bundle

- name: windows64-expert-bundle project: tor - enable: '[% c("var/torbrowser-windows-x86_64") %]' + enable: '[% c("var/browser-windows-x86_64") && c("var/tor-browser") %]' target: - '[% c("var/build_target") %]' - - torbrowser-windows-x86_64 + - '[% c("var/browser_type") %]-windows-x86_64' - expert-bundle

- name: src-firefox project: firefox - enable: '[% c("var/torbrowser-src") %]' + enable: '[% c("var/browser-src") %]' pkg_type: src-tarballs target: - '[% c("var/build_target") %]' - - torbrowser-src + - browser-src + - '[% c("var/browser_type") %]'

- name: src-tor-launcher project: tor-launcher - enable: '[% c("var/torbrowser-src") %]' + enable: '[% c("var/browser-src") && c("var/tor-browser") %]' pkg_type: src-tarballs target: - '[% c("var/build_target") %]' - - torbrowser-src + - browser-src + - '[% c("var/browser_type") %]'

steps: signtag:

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 440faf032bb782d384f9aed7b2b7b1e1f63dca15 Author: Nicolas Vigier boklm@torproject.org AuthorDate: Thu Jun 9 15:14:50 2022 +0200

Bug 40501: Add base-browser makefile targets --- Makefile | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ README | 4 ++ doc/MAKEFILE.txt | 5 ++ 3 files changed, 191 insertions(+)

diff --git a/Makefile b/Makefile index c5e607e..957234d 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,10 @@ rbm=./rbm/rbm

all: torbrowser-release

+####################### +# Tor Browser Targets # +####################### + torbrowser-release: submodule-update $(rbm) build release --target release --target browser-all --target torbrowser

@@ -264,6 +268,184 @@ cargo_vendor-lucetc: submodule-update cargo_vendor-uniffi-rs: submodule-update $(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64

+ +######################## +# Base Browser Targets # +######################## + +basebrowser-release: submodule-update + $(rbm) build release --target release --target browser-all --target basebrowser + +basebrowser-release-android: submodule-update + $(rbm) build release --target release --target browser-all-android --target basebrowser + +basebrowser-release-android-armv7: submodule-update + $(rbm) build release --target release --target browser-android-armv7 --target basebrowser + +basebrowser-release-android-x86: submodule-update + $(rbm) build release --target release --target browser-android-x86 --target basebrowser + +basebrowser-release-android-x86_64: submodule-update + $(rbm) build release --target release --target browser-android-x86_64 --target basebrowser + +basebrowser-release-android-aarch64: submodule-update + $(rbm) build release --target release --target browser-android-aarch64 --target basebrowser + +basebrowser-release-desktop: submodule-update + $(rbm) build release --target release --target browser-all-desktop --target basebrowser + +basebrowser-release-linux-x86_64: submodule-update + $(rbm) build release --target release --target browser-linux-x86_64 --target basebrowser + +basebrowser-release-linux-x86_64-asan: submodule-update + $(rbm) build release --target release --target browser-linux-x86_64-asan --target basebrowser + +basebrowser-release-linux-i686: submodule-update + $(rbm) build release --target release --target browser-linux-i686 --target basebrowser + +basebrowser-release-windows-i686: submodule-update + $(rbm) build release --target release --target browser-windows-i686 --target basebrowser + +basebrowser-release-windows-x86_64: submodule-update + $(rbm) build release --target release --target browser-windows-x86_64 --target basebrowser + +basebrowser-release-osx-x86_64: submodule-update + $(rbm) build release --target release --target browser-osx-x86_64 --target basebrowser + +basebrowser-release-src: submodule-update + $(rbm) build release --target release --target browser-src --target basebrowser + +basebrowser-alpha: submodule-update + $(rbm) build release --target alpha --target browser-all --target basebrowser + +basebrowser-alpha-android: submodule-update + $(rbm) build release --target alpha --target browser-all-android --target basebrowser + +basebrowser-alpha-android-armv7: submodule-update + $(rbm) build release --target alpha --target browser-android-armv7 --target basebrowser + +basebrowser-alpha-android-x86: submodule-update + $(rbm) build release --target alpha --target browser-android-x86 --target basebrowser + +basebrowser-alpha-android-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-android-x86_64 --target basebrowser + +basebrowser-alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target browser-android-aarch64 --target basebrowser + +basebrowser-alpha-desktop: submodule-update + $(rbm) build release --target alpha --target browser-all-desktop --target basebrowser + +basebrowser-alpha-linux-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-linux-x86_64 --target basebrowser + +basebrowser-alpha-linux-x86_64-asan: submodule-update + $(rbm) build release --target alpha --target browser-linux-x86_64-asan --target basebrowser + +basebrowser-alpha-linux-i686: submodule-update + $(rbm) build release --target alpha --target browser-linux-i686 --target basebrowser + +basebrowser-alpha-windows-i686: submodule-update + $(rbm) build release --target alpha --target browser-windows-i686 --target basebrowser + +basebrowser-alpha-windows-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-windows-x86_64 --target basebrowser + +basebrowser-alpha-osx-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-osx-x86_64 --target basebrowser + +basebrowser-alpha-src: submodule-update + $(rbm) build release --target alpha --target browser-src --target basebrowser + +basebrowser-nightly: submodule-update + $(rbm) build release --target nightly --target browser-all --target basebrowser + +basebrowser-nightly-android: submodule-update + $(rbm) build release --target nightly --target browser-all-android --target basebrowser + +basebrowser-nightly-android-armv7: submodule-update + $(rbm) build release --target nightly --target browser-android-armv7 --target basebrowser + +basebrowser-nightly-android-x86: submodule-update + $(rbm) build release --target nightly --target browser-android-x86 --target basebrowser + +basebrowser-nightly-android-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-android-x86_64 --target basebrowser + +basebrowser-nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target browser-android-aarch64 --target basebrowser + +basebrowser-nightly-desktop: submodule-update + $(rbm) build release --target nightly --target browser-all-desktop --target basebrowser + +basebrowser-nightly-linux-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-linux-x86_64 --target basebrowser + +basebrowser-nightly-linux-x86_64-asan: submodule-update + $(rbm) build release --target nightly --target browser-linux-x86_64-asan --target basebrowser + +basebrowser-nightly-linux-i686: submodule-update + $(rbm) build release --target nightly --target browser-linux-i686 --target basebrowser + +basebrowser-nightly-windows-i686: submodule-update + $(rbm) build release --target nightly --target browser-windows-i686 --target basebrowser + +basebrowser-nightly-windows-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-windows-x86_64 --target basebrowser + +basebrowser-nightly-osx-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-osx-x86_64 --target basebrowser + +basebrowser-nightly-src: submodule-update + $(rbm) build release --target nightly --target browser-src --target basebrowser + +basebrowser-testbuild: submodule-update + $(rbm) build release --target testbuild --target browser-all --target basebrowser + +basebrowser-testbuild-android: submodule-update + $(rbm) build release --target testbuild --target browser-all-android --target basebrowser + +basebrowser-testbuild-android-armv7: submodule-update + $(rbm) build release --target testbuild --target browser-android-armv7 --target basebrowser + +basebrowser-testbuild-android-x86: submodule-update + $(rbm) build release --target testbuild --target browser-android-x86 --target basebrowser + +basebrowser-testbuild-android-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-android-x86_64 --target basebrowser + +basebrowser-testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target browser-android-aarch64 --target basebrowser + +basebrowser-testbuild-desktop: submodule-update + $(rbm) build release --target testbuild --target browser-all-desktop --target basebrowser + +basebrowser-testbuild-linux-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-linux-x86_64 --target basebrowser + +basebrowser-testbuild-linux-x86_64-asan: submodule-update + $(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target basebrowser + +basebrowser-testbuild-linux-i686: submodule-update + $(rbm) build release --target testbuild --target browser-linux-i686 --target basebrowser + +basebrowser-testbuild-windows-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-windows-x86_64 --target basebrowser + +basebrowser-testbuild-windows-i686: submodule-update + $(rbm) build release --target testbuild --target browser-windows-i686 --target basebrowser + +basebrowser-testbuild-osx-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-osx-x86_64 --target basebrowser + +basebrowser-testbuild-src: submodule-update + $(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser + + +################## +# Common Targets # +################## + submodule-update: git submodule update --init

diff --git a/README b/README index d579362..3bc8177 100644 --- a/README +++ b/README @@ -95,6 +95,10 @@ mar file will be created. If you want to base your testbuild on the latest nightly code insted, rename rbm.local.conf.example to rbm.local.conf and adapt the torbrowser-testbuild option accordingly.

+Similar makefile targets exist for building Base Browser instead of +Tor Browser. To build Base Browser, replace `torbrowser` by `basebrowser` +in the target name. +

Updating git sources -------------------- diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt index 4316e67..fe24abf 100644 --- a/doc/MAKEFILE.txt +++ b/doc/MAKEFILE.txt @@ -57,6 +57,11 @@ torbrowser-{release,alpha,nightly,testbuild}-src ------------------------------------------------ Create source tarballs for firefox, torbutton and tor-launcher.

+basebrowser-* +------------- +The same rules for building Tor Browser also exist for building +Base Browser. + fetch ----- Fetch new commits from all components. This is useful when you want to

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

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 a61134f3c64734f6b8f8243ba5cb85eb79c3c55c Author: Nicolas Vigier boklm@torproject.org AuthorDate: Tue Jun 14 16:49:52 2022 +0200

Bug 40500: Update projects/browser for base-browser --- projects/browser/RelativeLink/execdesktop | 2 +- .../{start-tor-browser => start-browser} | 86 ++++----- .../browser/RelativeLink/start-browser.desktop | 34 ++++ .../browser/RelativeLink/start-tor-browser.desktop | 34 ---- projects/browser/build | 199 ++++++++++++--------- projects/browser/build.android | 4 +- projects/browser/config | 26 +-- projects/browser/pe_checksum_fix.py | 4 +- projects/browser/windows-installer/basebrowser.ico | Bin 0 -> 23934 bytes projects/browser/windows-installer/basebrowser.nsi | 185 +++++++++++++++++++ 10 files changed, 395 insertions(+), 179 deletions(-)

diff --git a/projects/browser/RelativeLink/execdesktop b/projects/browser/RelativeLink/execdesktop index fa6dc0a..5e3e65e 100755 --- a/projects/browser/RelativeLink/execdesktop +++ b/projects/browser/RelativeLink/execdesktop @@ -1,6 +1,6 @@ #!/usr/bin/env bash

-TBB_START_PROG="$(grep '^X-TorBrowser-ExecShell' $1 | tail -1 | sed 's/^X-TorBrowser-ExecShell=//' | sed 's/%.//')" +TBB_START_PROG="$(grep '^X-[% c("var/ProjectName") %]-ExecShell' $1 | tail -1 | sed 's/^X-[% c("var/ProjectName") %]-ExecShell=//' | sed 's/%.//')"

shift

diff --git a/projects/browser/RelativeLink/start-tor-browser b/projects/browser/RelativeLink/start-browser similarity index 72% rename from projects/browser/RelativeLink/start-tor-browser rename to projects/browser/RelativeLink/start-browser index 8f0764c..b7b96d2 100755 --- a/projects/browser/RelativeLink/start-tor-browser +++ b/projects/browser/RelativeLink/start-browser @@ -5,11 +5,11 @@ # # Copyright 2017 The Tor Project. See LICENSE for licensing information.

-complain_dialog_title="Tor Browser" +complain_dialog_title="[% c('var/Project_Name') %]"

-# Make sure this script wasn't started as 'sh start-tor-browser' or similar. +# Make sure this script wasn't started as 'sh start-[% c('var/project-name') %]' or similar. if [ "x$BASH" = "x" ]; then - echo "$complain_dialog_title should be started as './start-tor-browser'" + echo "$complain_dialog_title should be started as './start-[% c('var/project-name') %]'" echo "Exiting." >&2 exit 1; fi @@ -83,22 +83,22 @@ complain () { }

if [ "`id -u`" -eq 0 ]; then - complain "The Tor Browser Bundle should not be run as root. Exiting." + complain "The [% c('var/Project_Name') %] should not be run as root. Exiting." exit 1 fi

if test -r /proc/cpuinfo && ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then - complain "Tor Browser requires a CPU with SSE2 support. Exiting." + complain "[% c('var/Project_Name') %] requires a CPU with SSE2 support. Exiting." exit 1 fi

tbb_usage () { - printf "\nTor Browser Script Options\n" + printf "\n[% c('var/Project_Name') %] Script Options\n" printf " --verbose Display Tor and Firefox output in the terminal\n" - printf " --log [file] Record Tor and Firefox output in file (default: tor-browser.log)\n" - printf " --detach Detach from terminal and run Tor Browser in the background.\n" - printf " --register-app Register Tor Browser as a desktop app for this user\n" - printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" + printf " --log [file] Record Tor and Firefox output in file (default: [% c('var/project-name') %].log)\n" + printf " --detach Detach from terminal and run [% c('var/Project_Name') %] in the background.\n" + printf " --register-app Register [% c('var/Project_Name') %] as a desktop app for this user\n" + printf " --unregister-app Unregister [% c('var/Project_Name') %] as a desktop app for this user\n" } log_output=0 show_output=0 @@ -125,14 +125,14 @@ do ;; -l | --log) if [ -z "$2" -o "${2:0:1}" == "-" ]; then - printf "Logging Tor Browser debug information to tor-browser.log\n" - logfile="../tor-browser.log" + printf "Logging [% c('var/Project_Name') %] debug information to [% c('var/project-name') %].log\n" + logfile="../[% c('var/project-name') %].log" elif [ "${2:0:1}" == "/" -o "${2:0:1}" == "~" ]; then - printf "Logging Tor Browser debug information to %s\n" "$2" + printf "Logging [% c('var/Project_Name') %] debug information to %s\n" "$2" logfile="$2" shift else - printf "Logging Tor Browser debug information to %s\n" "$2" + printf "Logging [% c('var/Project_Name') %] debug information to %s\n" "$2" logfile="../$2" shift fi @@ -203,7 +203,7 @@ if [ -L "$myname" ]; then myname="`readlink -f "$myname" 2>/dev/null`" if [ "$?" -ne 0 ]; then # Ugh. - complain "start-tor-browser cannot be run using a symlink on this operating system." + complain "start-[% c('var/project-name') %] cannot be run using a symlink on this operating system." fi fi fi @@ -229,26 +229,26 @@ fi

# Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. -cp start-tor-browser.desktop ../ -sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '"$PWD/start-tor-browser" --detach || ([ ! -x "$PWD/start-tor-browser" ] && "$(dirname "$*")"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop +cp start-[% c('var/project-name') %].desktop ../ +sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[% c('var/project-name') %].desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-[% c('var/project-name') %].desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '"$PWD/start-[% c('var/project-name') %]" --detach || ([ ! -x "$PWD/start-[% c('var/project-name') %]" ] && "$(dirname "$*")"/Browser/start-[% c('var/project-name') %] --detach)' dummy %k,g" ../start-[% c('var/project-name') %].desktop

if [ "$register_desktop_app" -eq 1 ]; then mkdir -p "$HOME/.local/share/applications/" - cp ../start-tor-browser.desktop "$HOME/.local/share/applications/" + cp ../start-[% c('var/project-name') %].desktop "$HOME/.local/share/applications/" update-desktop-database "$HOME/.local/share/applications/" - printf "Tor Browser has been registered as a desktop app for this user in ~/.local/share/applications/\n" + printf "[% c('var/Project_Name') %] has been registered as a desktop app for this user in ~/.local/share/applications/\n" exit 0 fi

if [ "$register_desktop_app" -eq -1 ]; then - if [ -e "$HOME/.local/share/applications/start-tor-browser.desktop" ]; then - rm -f "$HOME/.local/share/applications/start-tor-browser.desktop" + if [ -e "$HOME/.local/share/applications/start-[% c('var/project-name') %].desktop" ]; then + rm -f "$HOME/.local/share/applications/start-[% c('var/project-name') %].desktop" update-desktop-database "$HOME/.local/share/applications/" - printf "Tor Browser has been removed as a user desktop app (from ~/.local/share/applications/)\n" + printf "[% c('var/Project_Name') %] has been removed as a user desktop app (from ~/.local/share/applications/)\n" else - printf "Tor Browser does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" + printf "[% c('var/Project_Name') %] does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" fi exit 0 fi @@ -256,6 +256,7 @@ fi HOME="${PWD}" export HOME

+[% IF c("var/tor-browser") -%] SYSARCHITECTURE=$(getconf LONG_BIT) TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF ([[:digit:]]*)')

@@ -263,6 +264,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then complain "Wrong architecture? 32-bit vs. 64-bit." exit 1 fi +[% END -%]

[% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get @@ -271,6 +273,7 @@ ASAN_OPTIONS="detect_leaks=0" export ASAN_OPTIONS [% END -%]

+[% IF c("var/tor-browser") -%] function setControlPortPasswd() { local ctrlPasswd=$1

@@ -332,9 +335,10 @@ TOR_CONTROL_PASSWD environment variable." # Either set `TOR_CONTROL_PASSWD` before running ./start-tor-browser, or put # your password in the following line where the word “secret” is: setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} +[% END -%]

# Set up custom bundled fonts. See fonts-conf(5). -export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" +export FONTCONFIG_PATH="${HOME}/[% c('var/ProjectName') %]/Data/fontconfig" export FONTCONFIG_FILE="fonts.conf"

# Avoid overwriting user's dconf values. Fixes #27903. @@ -352,28 +356,28 @@ cd "${HOME}"

if [ "$show_usage" -eq 1 ]; then # Display Firefox help, then our help - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \ - --class "Tor Browser" --name "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default --help 2>/dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ + -profile [% c('var/ProjectName') %]/Data/Browser/profile.default --help 2>/dev/null tbb_usage elif [ "$detach" -eq 1 ] ; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \ - --class "Tor Browser" --name "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ + -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \ - --class "Tor Browser" --name "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ + -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ tee "$logfile" elif [ "$show_output" -eq 1 ]; then - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \ - --class "Tor Browser" --name "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" < /dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ + -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" < /dev/null else - TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox \ - --class "Tor Browser" --name "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" \ + -profile [% c('var/ProjectName') %]/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null fi

exit $? diff --git a/projects/browser/RelativeLink/start-browser.desktop b/projects/browser/RelativeLink/start-browser.desktop new file mode 100755 index 0000000..68f0075 --- /dev/null +++ b/projects/browser/RelativeLink/start-browser.desktop @@ -0,0 +1,34 @@ +#!/usr/bin/env ./Browser/execdesktop +# +# This file is a self-modifying .desktop file that can be run from the shell. +# It preserves arguments and environment for the start-[% c("var/project-name") %] script. +# +# Run './start-[% c("var/project-name") %].desktop --help' to display the full set of options. +# +# When invoked from the shell, this file must always be in a [% c("var/Project_Name") %] root +# directory. When run from the file manager or desktop GUI, it is relocatable. +# +# After first invocation, it will update itself with the absolute path to the +# current [% c("var/Project_Name") %] location, to support relocation of this .desktop file for GUI +# invocation. You can also add [% c("var/Project_Name") %] to your desktop's application menu +# by running './start-[% c("var/project-name") %].desktop --register-app' +# +# If you use --register-app, and then relocate your [% c("var/Project_Name") %] directory, [% c("var/Project_Name") %] +# will no longer launch from your desktop's app launcher/dock. However, if you +# re-run --register-app from inside that new directory, the script +# will correct the absolute paths and re-register itself. +# +# This file will also still function if the path changes when [% c("var/Project_Name") %] is used as a +# portable app, so long as it is run directly from that new directory, either +# via the shell or via the file manager. + +[Desktop Entry] +Type=Application +Name=[% c("var/Project_Name") %] Setup +GenericName=Web Browser +Comment=[% c("var/Project_Name") %] is +1 for privacy and −1 for mass surveillance +Categories=Network;WebBrowser;Security; +Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %] --detach || ([ ! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %] ] && "$(dirname "$*")"/start-[% c("var/project-name") %] --detach)' dummy %k +X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[% c("var/project-name") %] --detach +Icon=web-browser +StartupWMClass=[% c("var/Project_Name") %] diff --git a/projects/browser/RelativeLink/start-tor-browser.desktop b/projects/browser/RelativeLink/start-tor-browser.desktop deleted file mode 100755 index c02a59f..0000000 --- a/projects/browser/RelativeLink/start-tor-browser.desktop +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env ./Browser/execdesktop -# -# This file is a self-modifying .desktop file that can be run from the shell. -# It preserves arguments and environment for the start-tor-browser script. -# -# Run './start-tor-browser.desktop --help' to display the full set of options. -# -# When invoked from the shell, this file must always be in a Tor Browser root -# directory. When run from the file manager or desktop GUI, it is relocatable. -# -# After first invocation, it will update itself with the absolute path to the -# current TBB location, to support relocation of this .desktop file for GUI -# invocation. You can also add Tor Browser to your desktop's application menu -# by running './start-tor-browser.desktop --register-app' -# -# If you use --register-app, and then relocate your TBB directory, Tor Browser -# will no longer launch from your desktop's app launcher/dock. However, if you -# re-run --register-app from inside that new directory, the script -# will correct the absolute paths and re-register itself. -# -# This file will also still function if the path changes when TBB is used as a -# portable app, so long as it is run directly from that new directory, either -# via the shell or via the file manager. - -[Desktop Entry] -Type=Application -Name=Tor Browser Setup -GenericName=Web Browser -Comment=Tor Browser is +1 for privacy and −1 for mass surveillance -Categories=Network;WebBrowser;Security; -Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k -X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach -Icon=web-browser -StartupWMClass=Tor Browser diff --git a/projects/browser/build b/projects/browser/build index 750883c..9c7e4a0 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -20,9 +20,9 @@ GENERATEDPREFSPATH=$rootdir/Bundle-Data/PTConfigs/generated-prefs.js touch "$GENERATEDPREFSPATH"

[% IF c("var/osx") %] - TBDIR="$TB_STAGE_DIR/Tor Browser.app" + TBDIR="$TB_STAGE_DIR/[% c("var/Project_Name") %].app"

- DOCSPATH=Contents/Resources/TorBrowser/Docs + DOCSPATH=Contents/Resources/[% c('var/ProjectName') %]/Docs EXTSPATH=Contents/Resources/distribution/extensions TORBINPATH=Contents/MacOS/Tor TORCONFIGPATH=Contents/Resources/TorBrowser/Tor @@ -32,11 +32,11 @@ touch "$GENERATEDPREFSPATH" [% ELSE %] TBDIR=$TB_STAGE_DIR/Browser

- DOCSPATH=TorBrowser/Docs - EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions + DOCSPATH=[% c('var/ProjectName') %]/Docs + EXTSPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions TORCONFIGPATH=TorBrowser/Data/Tor

- mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" + mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches" [% END %]

mkdir -p "$TBDIR/$EXTSPATH" @@ -47,42 +47,57 @@ MARTOOLS=$rootdir/mar-tools

mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"

-tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] -tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% IF c("var/tor-browser") -%] + tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] + tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% END -%]

tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]

[% IF c("var/linux") %] - cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ - cp RelativeLink/start-tor-browser.desktop ${TB_STAGE_DIR}/ - cat > ${TB_STAGE_DIR}/Browser/start-tor-browser << 'RBM_TB_EOF' -[% INCLUDE 'RelativeLink/start-tor-browser' -%] + cat > ${TB_STAGE_DIR}/start-[% c("var/project-name") %].desktop << 'RBM_TB_EOF' +[% INCLUDE 'RelativeLink/start-browser.desktop' -%] +RBM_TB_EOF + cat > ${TB_STAGE_DIR}/Browser/start-[% c("var/project-name") %] << 'RBM_TB_EOF' +[% INCLUDE 'RelativeLink/start-browser' -%] RBM_TB_EOF + cat > ${TB_STAGE_DIR}/Browser/execdesktop << 'RBM_TB_EOF' +[% INCLUDE 'RelativeLink/execdesktop' -%] +RBM_TB_EOF + chmod +x ${TB_STAGE_DIR}/start-[% c("var/project-name") %].desktop \ + ${TB_STAGE_DIR}/Browser/start-[% c("var/project-name") %] \ + ${TB_STAGE_DIR}/Browser/execdesktop + cp ${TB_STAGE_DIR}/start-[% c("var/project-name") %].desktop \ + ${TB_STAGE_DIR}/Browser [% IF c("var/namecoin") %] pushd ${TB_STAGE_DIR}/Browser/ patch -p1 < $rootdir/namecoin.patch popd [% END %] - chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 mkdir -p $GTK_SETTINGS_DIR cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %]

-tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz +tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz

-# Include the Tor Browser manual -TMP_MANUAL_PATH=$rootdir/tmp_manual/ -mkdir $TMP_MANUAL_PATH -pushd $TMP_MANUAL_PATH -tar -xf $rootdir/[% c('input_files_by_name/manual') %] -find . -exec [% c("touch") %] {} ; -find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/omni.ja" -popd -rm -rf $TMP_MANUAL_PATH +[% IF c("var/tor-browser") -%] + # Include the Tor Browser manual + TMP_MANUAL_PATH=$rootdir/tmp_manual/ + mkdir $TMP_MANUAL_PATH + pushd $TMP_MANUAL_PATH + tar -xf $rootdir/[% c('input_files_by_name/manual') %] + find . -exec [% c("touch") %] {} ; + find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/omni.ja" + popd + rm -rf $TMP_MANUAL_PATH +[% END -%] + +[% IF c("var/tor-browser") -%] + tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz +[% END -%]

-tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz [% IF c("var/namecoin") %] # Extract Electrum-NMC tar -C "$TBDIR/TorBrowser" -xf [% c('input_files_by_name/electrum-nmc') %] @@ -112,48 +127,56 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mkdir -p $SKELETON_TMP_RESOURCES/browser echo "[XRE]" > $SKELETON_TMP_RESOURCES/browser/override.ini echo "EnableProfileMigrator=0" >> $SKELETON_TMP_RESOURCES/browser/override.ini - mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor - cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ + [% IF c("var/tor-browser") -%] + mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor + cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ + [% END -%] # Place a copy of the bookmarks.html file at the top. It will be moved into # browser/omni.ja later cp -p Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html $rootdir rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac

- # Install a "tor" shim that sets the working directory. See #10030. - mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" - cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" + [% IF c("var/tor-browser") -%] + # Install a "tor" shim that sets the working directory. See #10030. + mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" + cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" + [% END -%]

tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]

mkdir -p "$TBDIR/$DOCSPATH" cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" -tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x - -cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" - -function bridges_conf { - local pt="$1" - local i=1 - while read -r line - do - echo "pref("extensions.torlauncher.default_bridge.$pt.$i", "$line");" >> "$GENERATEDPREFSPATH" - i=$((i + 1)) - done < "$rootdir/bridges_list.$pt.txt" -} -bridges_conf obfs4 -bridges_conf meek-azure -bridges_conf snowflake +tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/[% c('var/ProjectName') %][% END %]" -x + +[% IF c("var/tor-browser") -%] + cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" + + function bridges_conf { + local pt="$1" + local i=1 + while read -r line + do + echo "pref("extensions.torlauncher.default_bridge.$pt.$i", "$line");" >> "$GENERATEDPREFSPATH" + i=$((i + 1)) + done < "$rootdir/bridges_list.$pt.txt" + } + bridges_conf obfs4 + bridges_conf meek-azure + bridges_conf snowflake +[% END -%]

-[% IF ! c("var/multi_lingual") %] +[% IF ! c("var/multi_lingual") && c("var/tor-browser") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" [% END %]

[% IF c("var/linux") %] - chmod 700 ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser - chmod 700 ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Tor + chmod 700 ${TB_STAGE_DIR}/Browser/[% c('var/ProjectName') %]/Data/Browser + [% IF c("var/tor-browser") -%] + chmod 700 ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Tor + [% END -%] [% END %]

[% IF c("var/multi_lingual") %] @@ -162,18 +185,18 @@ bridges_conf snowflake # of the directory that is inside the package (in other words, users will # not see tor-browser_ALL after they install Tor Browser). PKG_LOCALE="ALL" - PKG_DIR="tor-browser" + PKG_DIR='[% c("var/project-name") %]' [% ELSE %] PKG_LOCALE="en-US" - PKG_DIR="tor-browser_${PKG_LOCALE}" + PKG_DIR="[% c('var/project-name') %]_${PKG_LOCALE}" [% END %]

pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/" -unzip omni.ja defaults/preferences/000-tor-browser.js || [ $? -lt 3 ] +unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ] # Append our built extension-overrides.js to 000-tor-browser.js -cat "$GENERATEDPREFSPATH" >> defaults/preferences/000-tor-browser.js -cp defaults/preferences/000-tor-browser.js $rootdir +cat "$GENERATEDPREFSPATH" >> defaults/preferences/[% c("var/prefs_file") %] +cp defaults/preferences/[% c("var/prefs_file") %] $rootdir [% IF c("var/osx") %] # Embed our default bookmarks within the en-US locale. mkdir -p chrome/en-US/locale/browser @@ -184,9 +207,9 @@ cp defaults/preferences/000-tor-browser.js $rootdir rm -rf chrome [% END %] # Set the locale of the bundle. -echo "pref("intl.locale.requested", "en-US");" >> defaults/preferences/000-tor-browser.js -[% c("touch") %] defaults/preferences/000-tor-browser.js -zip -Xm omni.ja defaults/preferences/000-tor-browser.js +echo "pref("intl.locale.requested", "en-US");" >> defaults/preferences/[% c("var/prefs_file") %] +[% c("touch") %] defaults/preferences/[% c("var/prefs_file") %] +zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %] rm -rf defaults # create tbb_version.json file for #25020 echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_version.json @@ -235,14 +258,14 @@ popd export PATH="/var/tmp/dist/nsis/bin:$PATH"

mv $rootdir/windows-installer $distdir/windows-installer - mv ${TB_STAGE_DIR} $distdir/windows-installer/"Tor Browser" + mv ${TB_STAGE_DIR} $distdir/windows-installer/"[% c('var/Project_Name') %]" mv $distdir/windows-installer ${TB_STAGE_DIR} [% END %]

[% IF c("var/windows") %] - TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" + TBDIR="$distdir/$PKG_DIR/[% c("var/Project_Name") %]/Browser" [% ELSIF c("var/osx") %] - TBDIR="$distdir/$PKG_DIR/Tor Browser.app" + TBDIR="$distdir/$PKG_DIR/[% c("var/Project_Name") %].app" [% ELSE %] TBDIR="$distdir/$PKG_DIR/Browser" [% END %] @@ -261,7 +284,7 @@ cd $distdir

[% IF c("var/build_mar") -%] # Create full MAR file and compressed package. - [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] + [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] MAR=$MARTOOLS/mar \ MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \ @@ -271,23 +294,23 @@ cd $distdir [% IF c("var/linux") %] [% c('tar', { tar_src => [ '$PKG_DIR' ], - tar_args => '-cJf $OUTDIR/tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.tar.xz', + tar_args => '-cJf $OUTDIR/' _ c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.tar.xz', }) %] [% ELSIF c("var/osx") %] [% c('var/ddmg', { dmg_src => '"$PKG_DIR"', - dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', + dmg_out => '$OUTDIR/' _ c('var/ProjectName') _ '-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("touch") %] {} ; pushd "$PKG_DIR" - makensis torbrowser.nsi + makensis [% c("var/projectname") %].nsi # Working around NSIS braindamage - mv torbrowser-install.exe torbrowser-install-tmp.exe + mv [% c("var/projectname") %]-install.exe browser-install-tmp.exe python3 $rootdir/pe_checksum_fix.py - mv torbrowser-install-tmp2.exe torbrowser-install.exe - rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe + mv browser-install-tmp2.exe [% c("var/projectname") %]-install.exe + rm browser-install-tmp.exe + mv [% c("var/projectname") %]-install.exe $OUTDIR/[% c("var/projectname") %]-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe popd [% END %] rm -rf $distdir/${PKG_DIR} @@ -295,12 +318,14 @@ SCRIPT_EOF

cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] - cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz + [% IF c("var/tor-browser") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/browser-debug.tar.xz "$OUTDIR"/[% c("var/project-name") %]-[% c("var/mar_osname") %]-debug.tar.xz + [% END -%] [% IF !c("var/asan") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ [% END -%] [% END -%] -[% IF c("var/linux") -%] +[% IF c("var/linux") && c("var/tor-browser") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%] [% IF c("var/build_infos_json") -%] @@ -308,7 +333,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% END -%]

# Create a tarball with all Linux x86_64 language packs (Bug 32676) -[% IF c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] +[% IF c("var/tor-browser") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] pushd $rootdir/[% c('input_files_by_name/firefox-langpacks') %] [% c('tar', { tar_src => [ '.' ], @@ -325,12 +350,12 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; - SET tbdir = '$distdir/tor-browser_' _ lang; - SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; + SET tbdir = '$distdir/' _ c("var/project-name") _ '_' _ lang; + SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; IF c("var/osx"); - SET browserdir = tbdir _ '/Tor Browser.app'; + SET browserdir = tbdir _ '/' _ c("var/Project_Name") _ '.app'; ELSIF c("var/windows"); - SET browserdir = tbdir _ '/Tor Browser/Browser'; + SET browserdir = tbdir _ '/' _ c("var/Project_Name") _ '/Browser'; ELSE; SET browserdir = tbdir _ '/Browser'; END; @@ -346,7 +371,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ END; END; %] - cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF + cat > "$scripts_dir/create-browser_[% lang %]" << SCRIPT_EOF #!/bin/bash set -e cp -a ${TB_STAGE_DIR} [% tbdir %] @@ -354,11 +379,11 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/

pushd "[% browserdir %]/[% IF c("var/osx") %]Contents/Resources/[% END %]browser/" mkdir -p defaults/preferences - cp $rootdir/000-tor-browser.js defaults/preferences/ + cp $rootdir/[% c("var/prefs_file") %] defaults/preferences/ # Set the locale of the bundle. - echo "pref("intl.locale.requested", "[% lang %]");" >> defaults/preferences/000-tor-browser.js - [% c("touch") %] defaults/preferences/000-tor-browser.js - zip -Xm omni.ja defaults/preferences/000-tor-browser.js + echo "pref("intl.locale.requested", "[% lang %]");" >> defaults/preferences/[% c("var/prefs_file") %] + [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %] + zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %] rm -rf defaults # create tbb_version.json file for #25020 echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_version.json @@ -387,10 +412,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% END -%]

[% IF c("var/linux") %] - [% SET tardir = 'tor-browser_' _ lang; + [% SET tardir = c("var/project-name") _ '_' _ lang; c('tar', { tar_src => [ tardir ], - tar_args => '-cJf $OUTDIR/tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.tar.xz', + tar_args => '-cJf $OUTDIR/' _ c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.tar.xz', }) %] [% ELSIF c("var/osx") %] [% # Rename the Japanese bundle to not confuse users @@ -399,18 +424,18 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ END; -%] [% c('var/ddmg', { dmg_src => tbdir, - dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', + dmg_out => '$OUTDIR/' _ c('var/ProjectName') _ '-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("touch") %] {} ; pushd "[% tbdir %]" - makensis torbrowser.nsi + makensis [% c("var/projectname") %].nsi # Working around NSIS braindamage - mv torbrowser-install.exe torbrowser-install-tmp.exe + mv [% c("var/projectname") %]-install.exe browser-install-tmp.exe python3 $rootdir/pe_checksum_fix.py - mv torbrowser-install-tmp2.exe torbrowser-install.exe - rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_[% lang %].exe + mv browser-install-tmp2.exe [% c("var/projectname") %]-install.exe + rm browser-install-tmp.exe + mv [% c("var/projectname") %]-install.exe $OUTDIR/[% c("var/projectname") %]-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_[% lang %].exe popd [% END %] rm -rf [% tbdir %] diff --git a/projects/browser/build.android b/projects/browser/build.android index 2e1b11f..589d117 100644 --- a/projects/browser/build.android +++ b/projects/browser/build.android @@ -3,9 +3,9 @@ [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] assets_dir=assets ext_dir=$assets_dir/extensions -qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk +qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/fenix/app-[% c("var/abi") %]-*.apk -test_out_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-androidTest.apk +test_out_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-androidTest.apk test_in_apk=$rootdir/fenix/app-*-androidTest.apk

tar xavf $rootdir/[% c('input_files_by_name/fenix') %] diff --git a/projects/browser/config b/projects/browser/config index 31e2cc1..ae820f8 100644 --- a/projects/browser/config +++ b/projects/browser/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' -filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +filename: '[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' container: use_container: 1

@@ -46,6 +46,12 @@ targets: build: '[% INCLUDE build.android %]' var: verify_allowed_addons: 1 + torbrowser: + var: + prefs_file: 000-tor-browser.js + basebrowser: + var: + prefs_file: 001-base-profile.js

input_files: - project: container-image @@ -59,7 +65,7 @@ input_files: enable: '[% c("var/android") %]' - project: tor name: tor - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - project: firefox-langpacks name: firefox-langpacks enable: '[% ! c("var/testbuild") && ! c("var/android") %]' @@ -71,19 +77,15 @@ input_files: enable: '[% ! c("var/android") %]' - project: obfs4 name: obfs4 - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - project: snowflake name: snowflake - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.mozilla.org/firefox/downloads/file/3954910/noscript-11.4.6.xp... name: noscript sha256sum: 5f917e54a52d7269959976ebb6eb41f1a14c047c30d5f7bd6a401fe4126f0b3a - - filename: 'RelativeLink/start-tor-browser.desktop' - enable: '[% c("var/linux") %]' - - filename: 'RelativeLink/execdesktop' - enable: '[% c("var/linux") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus @@ -118,11 +120,11 @@ input_files: - filename: verify_allowed_addons.py enable: '[% c("var/android") && c("var/verify_allowed_addons") %]' - filename: bridges_list.obfs4.txt - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - filename: bridges_list.meek-azure.txt - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - filename: bridges_list.snowflake.txt - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' - project: manual name: manual - enable: '[% ! c("var/android") %]' + enable: '[% ! c("var/android") && c("var/tor-browser") %]' diff --git a/projects/browser/pe_checksum_fix.py b/projects/browser/pe_checksum_fix.py index 73cd009..1ee56ad 100755 --- a/projects/browser/pe_checksum_fix.py +++ b/projects/browser/pe_checksum_fix.py @@ -45,7 +45,7 @@ Thanks to a cypherpunk for this workaround idea.

import pefile;

-f = open('torbrowser-install-tmp.exe', 'rb') +f = open('browser-install-tmp.exe', 'rb') exe = f.read() f.close() remainder = len(exe) % 8 @@ -53,4 +53,4 @@ if remainder > 0: exe += bytes('\0' * (8 - remainder), 'utf-8') pef = pefile.PE(data=exe, fast_load=True) pef.OPTIONAL_HEADER.CheckSum = pef.generate_checksum() -pef.write(filename='torbrowser-install-tmp2.exe') +pef.write(filename='browser-install-tmp2.exe') diff --git a/projects/browser/windows-installer/basebrowser.ico b/projects/browser/windows-installer/basebrowser.ico new file mode 100644 index 0000000..cce2759 Binary files /dev/null and b/projects/browser/windows-installer/basebrowser.ico differ diff --git a/projects/browser/windows-installer/basebrowser.nsi b/projects/browser/windows-installer/basebrowser.nsi new file mode 100644 index 0000000..5d3e858 --- /dev/null +++ b/projects/browser/windows-installer/basebrowser.nsi @@ -0,0 +1,185 @@ +;NSIS Installer for Base Browser Bundle +;Written by Moritz Bartl +;released under Public Domain + +;-------------------------------- +;Modern" UI + + !include "MUI2.nsh" + !include "LogicLib.nsh" + !include "WinVer.nsh" + +;-------------------------------- +;General + + ; location of Base Browser bundle to put into installer + !define TBBSOURCE ".\Base Browser" + + Name "Base Browser" + OutFile "basebrowser-install.exe" + + ;Default installation folder + InstallDir "$DESKTOP\Base Browser" + + ;Best (but slowest) compression + SetCompressor /SOLID lzma + SetCompressorDictSize 32 + + ;Request application privileges for Windows Vista + RequestExecutionLevel user + +;-------------------------------- +;Interface Configuration + + !define MUI_ICON "basebrowser.ico" + !define MUI_ABORTWARNING + +;-------------------------------- +;Modern UI settings + !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_FUNCTION "StartBaseBrowser" + !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS + !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" + !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" +;-------------------------------- +;Pages + + !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" ;first language is the default language + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SpanishInternational" + !insertmacro MUI_LANGUAGE "SimpChinese" + !insertmacro MUI_LANGUAGE "TradChinese" + !insertmacro MUI_LANGUAGE "Japanese" + !insertmacro MUI_LANGUAGE "Korean" + !insertmacro MUI_LANGUAGE "Italian" + !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Danish" + !insertmacro MUI_LANGUAGE "Swedish" + !insertmacro MUI_LANGUAGE "Norwegian" + !insertmacro MUI_LANGUAGE "NorwegianNynorsk" + !insertmacro MUI_LANGUAGE "Finnish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "Portuguese" + !insertmacro MUI_LANGUAGE "PortugueseBR" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Ukrainian" + !insertmacro MUI_LANGUAGE "Czech" + !insertmacro MUI_LANGUAGE "Slovak" + !insertmacro MUI_LANGUAGE "Croatian" + !insertmacro MUI_LANGUAGE "Bulgarian" + !insertmacro MUI_LANGUAGE "Hungarian" + !insertmacro MUI_LANGUAGE "Thai" + !insertmacro MUI_LANGUAGE "Romanian" + !insertmacro MUI_LANGUAGE "Latvian" + !insertmacro MUI_LANGUAGE "Macedonian" + !insertmacro MUI_LANGUAGE "Estonian" + !insertmacro MUI_LANGUAGE "Turkish" + !insertmacro MUI_LANGUAGE "Lithuanian" + !insertmacro MUI_LANGUAGE "Slovenian" + !insertmacro MUI_LANGUAGE "Serbian" + !insertmacro MUI_LANGUAGE "SerbianLatin" + !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Farsi" + !insertmacro MUI_LANGUAGE "Hebrew" + !insertmacro MUI_LANGUAGE "Indonesian" + !insertmacro MUI_LANGUAGE "Mongolian" + !insertmacro MUI_LANGUAGE "Luxembourgish" + !insertmacro MUI_LANGUAGE "Albanian" + !insertmacro MUI_LANGUAGE "Breton" + !insertmacro MUI_LANGUAGE "Belarusian" + !insertmacro MUI_LANGUAGE "Icelandic" + !insertmacro MUI_LANGUAGE "Malay" + !insertmacro MUI_LANGUAGE "Bosnian" + !insertmacro MUI_LANGUAGE "Kurdish" + !insertmacro MUI_LANGUAGE "Irish" + !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Galician" + !insertmacro MUI_LANGUAGE "Afrikaans" + !insertmacro MUI_LANGUAGE "Catalan" + !insertmacro MUI_LANGUAGE "Esperanto" + +;-------------------------------- +;Multi Language support: Read strings from separate file + +; !include torbrowser-langstrings.nsi + +;-------------------------------- +;Reserve Files + + ;If you are using solid compression, files that are required before + ;the actual installation should be stored first in the data block, + ;because this will make your installer start faster. + + !insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Sections + +Section "Base Browser Bundle" SecTBB + + SetOutPath "$INSTDIR" + File /r "${TBBSOURCE}*.*" + SetOutPath "$INSTDIR\Browser" + CreateShortCut "$INSTDIR\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + +SectionEnd + +Function CreateShortcuts + + CreateShortCut "$SMPROGRAMS\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$DESKTOP\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + +FunctionEnd +;-------------------------------- +;Installer Functions + +Function .onInit + + ${IfNot} ${AtLeastWin7} + MessageBox MB_USERICON|MB_OK "Base Browser requires at least Windows 7" + SetErrorLevel 1 + Quit + ${EndIf} + + ; Don't install on systems that don't support SSE2. The parameter value of + ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the + ; SSE2 instruction set is available. + System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" + + ${If} "$R7" == "0" + MessageBox MB_OK|MB_ICONSTOP "Sorry, Base Browser can't be installed. This version of Base Browser requires a processor with SSE2 support." + Abort + ${EndIf} + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Helper Functions + +Function CheckIfTargetDirectoryExists +${If} ${FileExists} "$INSTDIR*.*" + MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade the Base Browser Bundle, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort + Abort + NoAbort: +${EndIf} +FunctionEnd + + +Function StartBaseBrowser +ExecShell "open" "$INSTDIR/Start Base Browser.lnk" +FunctionEnd +

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 d853ed93c5757f9c09572b97e8ba995dfbf69b0b Author: Nicolas Vigier boklm@torproject.org AuthorDate: Fri Jun 24 15:29:11 2022 +0200

Bug 23656: Use mozconfig files from tor-browser.git to build firefox

We replace the multiple mozconfig files with a single one using templating. This mozconfig one includes the mozconfig files from tor-browser.git (added in tor-browser-build#40477).

We still need to do the same for geckoview. --- projects/firefox/build | 6 ++- projects/firefox/config | 2 - projects/firefox/mozconfig | 68 ++++++++++++++++++++++++++++ projects/firefox/mozconfig-linux-i686 | 45 ------------------ projects/firefox/mozconfig-linux-x86_64 | 44 ------------------ projects/firefox/mozconfig-linux-x86_64-asan | 49 -------------------- projects/firefox/mozconfig-osx-x86_64 | 53 ---------------------- projects/firefox/mozconfig-windows-i686 | 48 -------------------- projects/firefox/mozconfig-windows-x86_64 | 48 -------------------- 9 files changed, 72 insertions(+), 291 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build index a044163..999d79c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -62,7 +62,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz 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 +cat > .mozconfig << 'MOZCONFIG_EOF' +[% INCLUDE mozconfig %] +MOZCONFIG_EOF [% IF c("var/asan") -%] # Without disabling LSan our build is blowing up: # https://bugs.torproject.org/10599#comment:52 @@ -115,7 +117,7 @@ export MACH_USE_SYSTEM_PYTHON=1 ./mach build stage-package

[% IF c("var/osx") %] - cp -a obj-macos/dist/firefox/* $distdir + cp -a obj-*/dist/firefox/* $distdir [% IF c("var/base-browser") -%] mv "$distdir/Firefox.app" "$distdir/[% c('var/Project_Name') %].app" [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 6ddabbb..bc8d2e2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -129,8 +129,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - filename: get-moz-build-date - - filename: 'mozconfig-[% c("var/osname") %][% IF c("var/asan") %]-asan[% END %]' - name: mozconfig - project: binutils name: binutils enable: '[% c("var/linux") %]' diff --git a/projects/firefox/mozconfig b/projects/firefox/mozconfig new file mode 100755 index 0000000..344a78b --- /dev/null +++ b/projects/firefox/mozconfig @@ -0,0 +1,68 @@ +. $topsrcdir/mozconfig-[% IF c("var/osx"); GET 'macos-x86_64'; 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 + # fixed. We explicitly need to define the host compiler as well as for some + # reason the gcc-toolchain argument does not get passed along otherwise. + CC="clang --gcc-toolchain=/var/tmp/dist/gcc" + CXX="clang++ --gcc-toolchain=/var/tmp/dist/gcc" + HOST_CC=$CC + HOST_CXX=$CXX + + export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' +[% END -%] + +[% IF c("var/windows") -%] + CROSS_COMPILE=1 + + HOST_CC="clang" + HOST_CXX="clang++" + CC="[% c('arch') %]-w64-mingw32-clang" + CXX="[% c('arch') %]-w64-mingw32-clang++" + CXXFLAGS="-fms-extensions" + AR=llvm-ar + RANLIB=llvm-ranlib + + clang_path=/var/tmp/dist/mingw-w64-clang + + # For Stylo + BINDGEN_CFLAGS="-I$clang_path/[% c('arch') %]-w64-mingw32/include/c++/v1 -I$clang_path/[% c('arch') %]-w64-mingw32/include" +[% END -%] + +[% IF c("var/osx") -%] + TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain + + # ld needs libLTO.so from llvm + mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" + + CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools + CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.12.sdk + CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks + HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" + FLAGS="-target x86_64-apple-darwin -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" + + export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" + export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" + export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config + export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-pie" + export BINDGEN_CFLAGS="$FLAGS" + export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin- + export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil" + + export HOST_CFLAGS="-g" + export HOST_CXXFLAGS="-g" + export HOST_LDFLAGS="-g" + + ac_add_options --target=x86_64-apple-darwin + export MACOS_SDK_DIR=$CROSS_SYSROOT + export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS +[% END -%] + +[% IF c("var/tor-browser") %] + ac_add_options --enable-tor-browser-update + ac_add_options --enable-verify-mar +[% END -%] + +ac_add_options --with-relative-profile=[% c('var/ProjectName') %]/Data/Browser +mk_add_options MOZ_APP_DISPLAYNAME="[% c('var/Project_Name') %]" + diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 deleted file mode 100755 index 2ad1196..0000000 --- a/projects/firefox/mozconfig-linux-i686 +++ /dev/null @@ -1,45 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -# We want to build with clang now and point to the GCC toolchain until #29041 is -# fixed. We explicitly need to define the host compiler as well as for some -# reason the gcc-toolchain argument does not get passed along otherwise. -CC="clang --gcc-toolchain=/var/tmp/dist/gcc" -CXX="clang++ --gcc-toolchain=/var/tmp/dist/gcc" -HOST_CC=$CC -HOST_CXX=$CXX - -export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' - -ac_add_options --target=i686-linux-gnu - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --with-relative-profile=TorBrowser/Data/Browser - -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies - -# Bug 31448: ld.gold fails if we don't disable debug-symbols -ac_add_options --disable-debug-symbols - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 deleted file mode 100755 index d6bfdf4..0000000 --- a/projects/firefox/mozconfig-linux-x86_64 +++ /dev/null @@ -1,44 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -# We want to build with clang now and point to the GCC toolchain until #29041 is -# fixed. We explicitly need to define the host compiler as well as for some -# reason the gcc-toolchain argument does not get passed along otherwise. -CC="clang --gcc-toolchain=/var/tmp/dist/gcc" -CXX="clang++ --gcc-toolchain=/var/tmp/dist/gcc" -HOST_CC=$CC -HOST_CXX=$CXX - -export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --with-relative-profile=TorBrowser/Data/Browser - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies -# We want to bundle an own geckodriver, so we can use it for QA and other work -ac_add_options --enable-geckodriver - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-linux-x86_64-asan b/projects/firefox/mozconfig-linux-x86_64-asan deleted file mode 100644 index 508847a..0000000 --- a/projects/firefox/mozconfig-linux-x86_64-asan +++ /dev/null @@ -1,49 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -# We need to add -ldl explicitely due to bug 1213698 -export LDFLAGS="-fsanitize=address -ldl" - -# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff -# (which is part of mar-tools and is not distributed to end-users) with -# ASan. See bug 17858. -export HOST_CFLAGS="" -export HOST_CXXFLAGS="" -export HOST_LDFLAGS="-ldl" - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' - -ac_add_options --enable-address-sanitizer -ac_add_options --disable-jemalloc -ac_add_options --disable-elf-hack -ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --with-relative-profile=TorBrowser/Data/Browser - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 deleted file mode 100644 index ad5ea84..0000000 --- a/projects/firefox/mozconfig-osx-x86_64 +++ /dev/null @@ -1,53 +0,0 @@ -TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain - -# ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" - -CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools -CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.12.sdk -CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" - -export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" -export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" -export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-pie" -export BINDGEN_CFLAGS="$FLAGS" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin- -export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil" - -export HOST_CFLAGS="-g" -export HOST_CXXFLAGS="-g" -export HOST_LDFLAGS="-g" - -ac_add_options --target=x86_64-apple-darwin -export MACOS_SDK_DIR=$CROSS_SYSROOT -export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-application=browser -ac_add_options --enable-strip -ac_add_options --enable-official-branding -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --disable-debug - -ac_add_options --enable-tor-browser-data-outside-app-dir -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 deleted file mode 100644 index 0472eb1..0000000 --- a/projects/firefox/mozconfig-windows-i686 +++ /dev/null @@ -1,48 +0,0 @@ -CROSS_COMPILE=1 - -HOST_CC="clang" -HOST_CXX="clang++" -CC="i686-w64-mingw32-clang" -CXX="i686-w64-mingw32-clang++" -CXXFLAGS="-fms-extensions" -AR=llvm-ar -RANLIB=llvm-ranlib - -clang_path=/var/tmp/dist/mingw-w64-clang - -# For Stylo -BINDGEN_CFLAGS="-I$clang_path/i686-w64-mingw32/include/c++/v1 -I$clang_path/i686-w64-mingw32/include" - -ac_add_options --enable-application=browser -ac_add_options --target=i686-w64-mingw32 -ac_add_options --with-toolchain-prefix=i686-w64-mingw32- -ac_add_options --enable-default-toolkit=cairo-windows -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-strip -ac_add_options --enable-official-branding - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar -ac_add_options --disable-bits-download - -ac_add_options --with-relative-profile=TorBrowser/Data/Browser - -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies -ac_add_options --disable-webrtc # Bug 1393901 -ac_add_options --disable-parental-controls -ac_add_options --disable-tests - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= -ac_add_options --disable-default-browser-agent diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 deleted file mode 100644 index 66a8734..0000000 --- a/projects/firefox/mozconfig-windows-x86_64 +++ /dev/null @@ -1,48 +0,0 @@ -CROSS_COMPILE=1 - -HOST_CC="clang" -HOST_CXX="clang++" -CC="x86_64-w64-mingw32-clang" -CXX="x86_64-w64-mingw32-clang++" -CXXFLAGS="-fms-extensions" -AR=llvm-ar -RANLIB=llvm-ranlib - -clang_path=/var/tmp/dist/mingw-w64-clang - -# For Stylo -BINDGEN_CFLAGS="-I$clang_path/x86_64-w64-mingw32/include/c++/v1 -I$clang_path/x86_64-w64-mingw32/include" - -ac_add_options --enable-application=browser -ac_add_options --target=x86_64-w64-mingw32 -ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- -ac_add_options --enable-default-toolkit=cairo-windows -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-strip -ac_add_options --enable-official-branding - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar -ac_add_options --disable-bits-download - -ac_add_options --with-relative-profile=TorBrowser/Data/Browser - -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-webrtc # Bug 1393901 -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -ac_add_options --disable-system-policies - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= -ac_add_options --disable-default-browser-agent