commit 031ecd732636c627ea3b6343869d96ccbf3d2df0 Author: Richard Pospesel richard@torproject.org Date: Wed Nov 28 16:13:50 2018 -0800

Bug 28546: Rebrand Tor Browser's Window's Installer

This patch passes in the build channel to makensis as a !define so that the tbb-windows-installer torbrowser.nsi installer script can use appropriate branding and set branding-specific names and install paths. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index a990229..0ec7b0a 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.5 +version: 0.6 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..bc663c2 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} ; pushd "$PKG_DIR" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} ; pushd "[% tbdir %]" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py