commit 05043c202923b762be4d8c89589f26b5cd8a7027 Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Jul 25 09:02:00 2017 -0400

Make sure we build NSIS (#17895) --- projects/tor-messenger/build | 5 +++++ projects/tor-messenger/config | 3 +++ 2 files changed, 8 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index ef93e17..fbfbc6a 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -109,6 +109,11 @@ MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END % $MARTOOLS/make_full_update.sh \ -q $OUTDIR/$MAR_FILE tor-messenger/Browser

+[% IF c("var/windows") %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %] + export PATH="/var/tmp/dist/nsis/bin:$PATH" +[% END %] + [% IF c('var/windows') -%] makensis tor-messenger.nsi

diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index bc730c8..d3f15e1 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -36,6 +36,9 @@ input_files: - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' + - project: nsis + name: nsis + enable: '[% c("var/windows") %]' - project: container-image

var: