Commit 1f83faba authored by Richard Pospesel's avatar Richard Pospesel Committed by Georg Koppen
Browse files

Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines

Updated firefox build and config to pass appropriate path for
tor-browser branding using the --with-branding ./mach configure flag.
parent f22e3702
...@@ -158,7 +158,7 @@ fi ...@@ -158,7 +158,7 @@ fi
rm -f configure rm -f configure
rm -f js/src/configure rm -f js/src/configure
./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %]
./mach build --verbose ./mach build --verbose
[% IF c("var/android") %] [% IF c("var/android") %]
......
...@@ -12,6 +12,7 @@ var: ...@@ -12,6 +12,7 @@ var:
firefox_version: '[% c("var/firefox_platform_version") %]esr' firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 8.5 torbrowser_branch: 8.5
torbrowser_update_channel: alpha torbrowser_update_channel: alpha
branding_directory: browser/branding/alpha
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps: deps:
- build-essential - build-essential
...@@ -31,12 +32,14 @@ targets: ...@@ -31,12 +32,14 @@ targets:
release: release:
var: var:
torbrowser_update_channel: release torbrowser_update_channel: release
branding_directory: browser/branding/official
nightly: nightly:
git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0 tag_gpg_id: 0
var: var:
torbrowser_update_channel: default torbrowser_update_channel: default
branding_directory: browser/branding/nightly
android-armv7: android-armv7:
var: var:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment